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 cf972c1246c..0ebc166722a 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
@@ -446,7 +446,7 @@
       <tr id="font-family-invalid-characters-003-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-003.htm">font-family-invalid-characters-003</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -457,7 +457,7 @@
       <tr id="font-family-invalid-characters-004-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-004.htm">font-family-invalid-characters-004</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -468,7 +468,7 @@
       <tr id="font-family-invalid-characters-005-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-005.htm">font-family-invalid-characters-005</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -479,7 +479,7 @@
       <tr id="font-family-invalid-characters-006-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-006.htm">font-family-invalid-characters-006</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-003.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-003.htm
index 01890f37a53..1e303f8c145 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-003.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-003.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-004.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-004.htm
index 3b852bff909..06afaf605dc 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-004.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-004.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-005.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-005.htm
index e384e370e71..7b9d7e5d648 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-005.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-005.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-005-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-006.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-006.htm
index 33454ce30ba..d94ba896c26 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-006.htm
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/font-family-invalid-characters-006.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-006-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/reference/font-family-invalid-characters-005-ref.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/reference/font-family-invalid-characters-005-ref.htm
new file mode 100644
index 00000000000..33a0c7f6c7f
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/reference/font-family-invalid-characters-005-ref.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8">
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel">
+</head><body>
+  <p>Test passes if there are only numbers (1-4) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+    <div>3</div>
+    <div>4</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/html/reference/font-family-invalid-characters-006-ref.htm b/tests/wpt/css-tests/css-fonts-3_dev/html/reference/font-family-invalid-characters-006-ref.htm
new file mode 100644
index 00000000000..ba316f07cec
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/html/reference/font-family-invalid-characters-006-ref.htm
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8">
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel">
+</head><body>
+  <p>Test passes if there are only numbers (1-2) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</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 e7cb82fb963..c6bc0acf41d 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
@@ -344,6 +344,38 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="font-family-invalid-characters-003" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid curly brackets and pair matching">
+          <a href="font-family-invalid-characters-003.htm">font-family-invalid-characters-003</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-004" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid square brackets and pair matching">
+          <a href="font-family-invalid-characters-004.htm">font-family-invalid-characters-004</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-005" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid quotes and pair matching">
+          <a href="font-family-invalid-characters-005.htm">font-family-invalid-characters-005</a></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.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>
+    <tbody id="font-family-invalid-characters-006" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid single quotes and pair matching">
+          <a href="font-family-invalid-characters-006.htm">font-family-invalid-characters-006</a></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.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>
     <tbody id="font-family-name-001" class="font">
       <tr>
         <td rowspan="1" title="font family name with no quotes">
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 64319b436a6..55445f80812 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
@@ -39,6 +39,10 @@ font-family-applies-to-016.htm == reference/ref-if-there-is-no-red.htm
 font-family-applies-to-017.htm == reference/font-family-applies-to-001-ref.htm
 font-family-invalid-characters-001.htm == reference/font-family-invalid-characters-001-ref.htm
 font-family-invalid-characters-002.htm == reference/font-family-invalid-characters-002-ref.htm
+font-family-invalid-characters-003.htm == reference/font-family-invalid-characters-002-ref.htm
+font-family-invalid-characters-004.htm == reference/font-family-invalid-characters-002-ref.htm
+font-family-invalid-characters-005.htm == reference/font-family-invalid-characters-005-ref.htm
+font-family-invalid-characters-006.htm == reference/font-family-invalid-characters-006-ref.htm
 font-family-name-001.htm == reference/font-family-name-ref.htm
 font-family-name-002.htm == reference/font-family-name-ref.htm
 font-family-name-003.htm == reference/font-family-name-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 4f111cfdb9a..cdbf4574e50 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
@@ -253,14 +253,14 @@ html/font-family-invalid-characters-001.htm	449eb0f3295627f65a6386400d771ca86f45
 xhtml1/font-family-invalid-characters-001.xht	449eb0f3295627f65a6386400d771ca86f454c6c	?
 html/font-family-invalid-characters-002.htm	3d59693705c06a2105e9c32be950462108394a47	?
 xhtml1/font-family-invalid-characters-002.xht	3d59693705c06a2105e9c32be950462108394a47	?
-html/font-family-invalid-characters-003.htm	836b64a69397022366fd721fcab1aedbd869340c	?
-xhtml1/font-family-invalid-characters-003.xht	836b64a69397022366fd721fcab1aedbd869340c	?
-html/font-family-invalid-characters-004.htm	81c2353fba8bbbb408acbc6272951d9a22e9d0b5	?
-xhtml1/font-family-invalid-characters-004.xht	81c2353fba8bbbb408acbc6272951d9a22e9d0b5	?
-html/font-family-invalid-characters-005.htm	e8cd099e08c9e29876015789d990e1a41126c7c7	?
-xhtml1/font-family-invalid-characters-005.xht	e8cd099e08c9e29876015789d990e1a41126c7c7	?
-html/font-family-invalid-characters-006.htm	cbf2d4c8d6741038958506728525039b584cedf9	?
-xhtml1/font-family-invalid-characters-006.xht	cbf2d4c8d6741038958506728525039b584cedf9	?
+html/font-family-invalid-characters-003.htm	f97a9ef862be0c3008aa6684956be102012953d3	?
+xhtml1/font-family-invalid-characters-003.xht	f97a9ef862be0c3008aa6684956be102012953d3	?
+html/font-family-invalid-characters-004.htm	fe90154e0074f886663b9b9e7a8ae3d0fcb536f2	?
+xhtml1/font-family-invalid-characters-004.xht	fe90154e0074f886663b9b9e7a8ae3d0fcb536f2	?
+html/font-family-invalid-characters-005.htm	5024d4008e25d8c9bdc41fbe60ee41040d4f6819	?
+xhtml1/font-family-invalid-characters-005.xht	5024d4008e25d8c9bdc41fbe60ee41040d4f6819	?
+html/font-family-invalid-characters-006.htm	825885808c4250ef0babc9fed4f49577e8b7de20	?
+xhtml1/font-family-invalid-characters-006.xht	825885808c4250ef0babc9fed4f49577e8b7de20	?
 html/font-family-name-001.htm	7b14f6d140576152871525a8f532383679e60e50	?
 xhtml1/font-family-name-001.xht	7b14f6d140576152871525a8f532383679e60e50	?
 html/font-family-name-002.htm	4d882507a40bb4db9fd5acc74fc6b725e7053ef8	?
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 1a4a453b45e..a27f05d102b 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-fonts-3_dev/testinfo.data
@@ -124,10 +124,10 @@ font-family-applies-to-016	reference/ref-if-there-is-no-red	Font-family and 'dis
 font-family-applies-to-017	reference/font-family-applies-to-001-ref	Font-family and 'display: inherit' elements	ahem	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	734651906fb3bf28776c9a9acf53bf5acd5714be	`Microsoft`<http://www.microsoft.com/>	The 'font-family' property applies to 'display: inherit' elements.
 font-family-invalid-characters-001	reference/font-family-invalid-characters-001-ref	Invalid characters in font-family values	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	449eb0f3295627f65a6386400d771ca86f454c6c	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names invalidate entire declaration.
 font-family-invalid-characters-002	reference/font-family-invalid-characters-002-ref	Invalid parenthesis and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	3d59693705c06a2105e9c32be950462108394a47	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-003		Invalid curly brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	836b64a69397022366fd721fcab1aedbd869340c	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-004		Invalid square brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	81c2353fba8bbbb408acbc6272951d9a22e9d0b5	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-005		Invalid quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	e8cd099e08c9e29876015789d990e1a41126c7c7	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-006		Invalid single quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	cbf2d4c8d6741038958506728525039b584cedf9	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-003	reference/font-family-invalid-characters-002-ref	Invalid curly brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	f97a9ef862be0c3008aa6684956be102012953d3	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-004	reference/font-family-invalid-characters-002-ref	Invalid square brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	fe90154e0074f886663b9b9e7a8ae3d0fcb536f2	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-005	reference/font-family-invalid-characters-005-ref	Invalid quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	5024d4008e25d8c9bdc41fbe60ee41040d4f6819	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-006	reference/font-family-invalid-characters-006-ref	Invalid single quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	825885808c4250ef0babc9fed4f49577e8b7de20	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
 font-family-name-001	reference/font-family-name-ref	font family name with no quotes	font	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	7b14f6d140576152871525a8f532383679e60e50	`Mozilla`<http://www.mozilla.com/>	The 'font-family' property set to and installed font renders the appropriate font. Family name with no quotes.
 font-family-name-002	reference/font-family-name-ref	font family name with no quotes, lowercase	font	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	4d882507a40bb4db9fd5acc74fc6b725e7053ef8	`Mozilla`<http://www.mozilla.com/>	The 'font-family' property set to and installed font renders the appropriate font. Family name with no quotes, lowercase.
 font-family-name-003	reference/font-family-name-ref	font family name with no quotes, mixed case	font	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	bf19d1e16a163cc0db548a07af065b1d40895864	`Mozilla`<http://www.mozilla.com/>	The 'font-family' property set to and installed font renders the appropriate font. Family name with no quotes, mixed case.
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 eef0dba7a56..39458656ac1 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
@@ -446,7 +446,7 @@
       <tr id="font-family-invalid-characters-003-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -457,7 +457,7 @@
       <tr id="font-family-invalid-characters-004-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -468,7 +468,7 @@
       <tr id="font-family-invalid-characters-005-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -479,7 +479,7 @@
       <tr id="font-family-invalid-characters-006-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht
index 110298f1f3b..99ecc4f1f12 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht
index 929c75d751e..d12b777caa0 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht
index 76890af01c5..c6ba048b6be 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-005-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht
index ca42ac700fa..0049710c1e3 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-006-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht
new file mode 100644
index 00000000000..8c38fd9d633
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-005-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</title>
+<link href="http://www.intel.com" rel="author" title="Intel" />
+</head><body>
+  <p>Test passes if there are only numbers (1-4) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+    <div>3</div>
+    <div>4</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht
new file mode 100644
index 00000000000..cb74bcb433e
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht
@@ -0,0 +1,10 @@
+<!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" />
+</head><body>
+  <p>Test passes if there are only numbers (1-2) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</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 04e5702dbd0..aee8d0d8699 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
@@ -344,6 +344,38 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="font-family-invalid-characters-003" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid curly brackets and pair matching">
+          <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-004" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid square brackets and pair matching">
+          <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-005" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid quotes and pair matching">
+          <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.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>
+    <tbody id="font-family-invalid-characters-006" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid single quotes and pair matching">
+          <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.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>
     <tbody id="font-family-name-001" class="font">
       <tr>
         <td rowspan="1" title="font family name with no quotes">
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 becdc22e9df..54f667abf4a 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
@@ -39,6 +39,10 @@ font-family-applies-to-016.xht == reference/ref-if-there-is-no-red.xht
 font-family-applies-to-017.xht == reference/font-family-applies-to-001-ref.xht
 font-family-invalid-characters-001.xht == reference/font-family-invalid-characters-001-ref.xht
 font-family-invalid-characters-002.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-003.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-004.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-005.xht == reference/font-family-invalid-characters-005-ref.xht
+font-family-invalid-characters-006.xht == reference/font-family-invalid-characters-006-ref.xht
 font-family-name-001.xht == reference/font-family-name-ref.xht
 font-family-name-002.xht == reference/font-family-name-ref.xht
 font-family-name-003.xht == reference/font-family-name-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 eef0dba7a56..39458656ac1 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
@@ -446,7 +446,7 @@
       <tr id="font-family-invalid-characters-003-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -457,7 +457,7 @@
       <tr id="font-family-invalid-characters-004-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -468,7 +468,7 @@
       <tr id="font-family-invalid-characters-005-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -479,7 +479,7 @@
       <tr id="font-family-invalid-characters-006-3.1" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht
index cd7edeb86d3..172d96e8496 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht
index 9a4ddb09e88..0412d5f9135 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht
index 14c84c96565..f783356b229 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-005-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht
index 17e8a5064b7..790b3e61372 100644
--- a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-006-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht
new file mode 100644
index 00000000000..8c38fd9d633
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-005-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</title>
+<link href="http://www.intel.com" rel="author" title="Intel" />
+</head><body>
+  <p>Test passes if there are only numbers (1-4) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+    <div>3</div>
+    <div>4</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht
new file mode 100644
index 00000000000..cb74bcb433e
--- /dev/null
+++ b/tests/wpt/css-tests/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht
@@ -0,0 +1,10 @@
+<!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" />
+</head><body>
+  <p>Test passes if there are only numbers (1-2) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</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 04e5702dbd0..aee8d0d8699 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
@@ -344,6 +344,38 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="font-family-invalid-characters-003" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid curly brackets and pair matching">
+          <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-004" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid square brackets and pair matching">
+          <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-005" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid quotes and pair matching">
+          <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.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>
+    <tbody id="font-family-invalid-characters-006" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid single quotes and pair matching">
+          <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.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>
     <tbody id="font-family-name-001" class="font">
       <tr>
         <td rowspan="1" title="font family name with no quotes">
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 becdc22e9df..54f667abf4a 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
@@ -39,6 +39,10 @@ font-family-applies-to-016.xht == reference/ref-if-there-is-no-red.xht
 font-family-applies-to-017.xht == reference/font-family-applies-to-001-ref.xht
 font-family-invalid-characters-001.xht == reference/font-family-invalid-characters-001-ref.xht
 font-family-invalid-characters-002.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-003.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-004.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-005.xht == reference/font-family-invalid-characters-005-ref.xht
+font-family-invalid-characters-006.xht == reference/font-family-invalid-characters-006-ref.xht
 font-family-name-001.xht == reference/font-family-name-ref.xht
 font-family-name-002.xht == reference/font-family-name-ref.xht
 font-family-name-003.xht == reference/font-family-name-ref.xht
diff --git a/tests/wpt/css-tests/css-text-3_dev/html/bidi-004.htm b/tests/wpt/css-tests/css-text-3_dev/html/bidi-004.htm
new file mode 100644
index 00000000000..73639ffe3d4
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-3_dev/html/bidi-004.htm
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+ <head>
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model">
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules">
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes">
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
+  <link rel="help" href="http://unicode.org/reports/tr9/">
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0"> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.htm">
+
+  <meta name="flags" content="may21 ahem">
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp &#x202E; ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX &#x202C; XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-3_dev/html/chapter-4.htm b/tests/wpt/css-tests/css-text-3_dev/html/chapter-4.htm
index e811bbea374..f2031c45bbb 100644
--- a/tests/wpt/css-tests/css-text-3_dev/html/chapter-4.htm
+++ b/tests/wpt/css-tests/css-text-3_dev/html/chapter-4.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Module Level 3 CR Test Suite</h1>
-  <h2>White Space Processing Details (26 tests)</h2>
+  <h2>White Space Processing Details (27 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -43,7 +43,15 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.1">+</a>
         <a href="http://www.w3.org/TR/css-text-3/#white-space-rules">4.1 The White Space Processing Rules</a></th></tr>
-      <!-- 0 tests -->
+      <!-- 1 tests -->
+      <tr id="bidi-004-4.1" class="ahem may21">
+        <td>
+            <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
     </tbody>
     <tbody id="s4.1.1">
       <tr><th colspan="4" scope="rowgroup">
diff --git a/tests/wpt/css-tests/css-text-3_dev/html/reference/bidi-004-ref.htm b/tests/wpt/css-tests/css-text-3_dev/html/reference/bidi-004-ref.htm
new file mode 100644
index 00000000000..66d853ab88b
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-3_dev/html/reference/bidi-004-ref.htm
@@ -0,0 +1,33 @@
+<!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="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+  <meta name="flags" content="ahem">
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-3_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-text-3_dev/html/reftest-toc.htm
index fb00721d269..816963e0642 100644
--- a/tests/wpt/css-tests/css-text-3_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-text-3_dev/html/reftest-toc.htm
@@ -24,6 +24,14 @@
         <th>Flags</th>
       </tr>
     </thead>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="css3-text-line-break-jazh-001" class="font">
       <tr>
         <td rowspan="1" title="CSS3 Text, linebreaks: 3041 HIRAGANA LETTER SMALL A (strict,ja)">
diff --git a/tests/wpt/css-tests/css-text-3_dev/html/reftest.list b/tests/wpt/css-tests/css-text-3_dev/html/reftest.list
index e234596fd03..fa0ba2778a7 100644
--- a/tests/wpt/css-tests/css-text-3_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-text-3_dev/html/reftest.list
@@ -1,4 +1,5 @@
 
+bidi-004.htm == reference/bidi-004-ref.htm
 css3-text-line-break-jazh-001.htm == reference/css3-text-line-break-jazh-001-ref.htm
 css3-text-line-break-jazh-002.htm == reference/css3-text-line-break-jazh-002-ref.htm
 css3-text-line-break-jazh-003.htm == reference/css3-text-line-break-jazh-003-ref.htm
diff --git a/tests/wpt/css-tests/css-text-3_dev/html/toc.htm b/tests/wpt/css-tests/css-text-3_dev/html/toc.htm
index 5abadb5db87..c4c36585ee7 100644
--- a/tests/wpt/css-tests/css-text-3_dev/html/toc.htm
+++ b/tests/wpt/css-tests/css-text-3_dev/html/toc.htm
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.htm">Chapter 4 - 
         White Space Processing Details</a></th>
-      <td>(26 Tests)</td></tr>
+      <td>(27 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.htm">Chapter 5 - 
diff --git a/tests/wpt/css-tests/css-text-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-text-3_dev/implementation-report-TEMPLATE.data
index bfbfd8327b9..c346060cd01 100644
--- a/tests/wpt/css-tests/css-text-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-text-3_dev/implementation-report-TEMPLATE.data
@@ -3,6 +3,8 @@
 # http://test.csswg.org/suites/css-text-3_dev/DATESTAMP/
 # See http://wiki.csswg.org/test/implementation-report for instructions
 testname	revision	result	comment
+html/bidi-004.htm	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	?
+xhtml1/bidi-004.xht	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	?
 html/bidi-005.htm	9a94108988b0d806f23f5d63aec2a5b34d6aea05	?
 xhtml1/bidi-005.xht	9a94108988b0d806f23f5d63aec2a5b34d6aea05	?
 html/bidi-006.htm	a699b5134869e68b68c5399f9be53865f6bb90cd	?
diff --git a/tests/wpt/css-tests/css-text-3_dev/testinfo.data b/tests/wpt/css-tests/css-text-3_dev/testinfo.data
index 8abf0256760..26cfa2b56ec 100644
--- a/tests/wpt/css-tests/css-text-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-text-3_dev/testinfo.data
@@ -1,4 +1,5 @@
 id	references	title	flags	links	revision	credits	assertion
+bidi-004	reference/bidi-004-ref	The bidi algorithm and inlines in CSS	ahem,may21	http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-text-3/#white-space-rules,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/,http://www.w3.org/TR/html5/rendering.html#phrasing-content-0	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-005		The bidi algorithm and inlines in CSS: embed levels and white-space: pre;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	9a94108988b0d806f23f5d63aec2a5b34d6aea05	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-006		The bidi algorithm and inlines in CSS: embed levels and white-space: nowrap;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	a699b5134869e68b68c5399f9be53865f6bb90cd	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-007		The bidi algorithm and inlines in CSS: embed levels and float: left;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	52cbe1038400d33a001f042c6b78f1ee216c902b	`Ian Hickson`<mailto:ian@hixie.ch>	
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1/bidi-004.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1/bidi-004.xht
new file mode 100644
index 00000000000..131ff792d03
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1/bidi-004.xht
@@ -0,0 +1,44 @@
+<!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" lang="en" xml:lang="en">
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules" />
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="http://unicode.org/reports/tr9/" />
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0" /> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.xht" />
+
+  <meta name="flags" content="may21 ahem" />
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp ‮ ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX ‬ XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1/chapter-4.xht
index 538c41d166e..000254be6c3 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1/chapter-4.xht
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1/chapter-4.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Module Level 3 CR Test Suite</h1>
-  <h2>White Space Processing Details (26 tests)</h2>
+  <h2>White Space Processing Details (27 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -43,7 +43,15 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.1">+</a>
         <a href="http://www.w3.org/TR/css-text-3/#white-space-rules">4.1 The White Space Processing Rules</a></th></tr>
-      <!-- 0 tests -->
+      <!-- 1 tests -->
+      <tr id="bidi-004-4.1" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
     </tbody>
     <tbody id="s4.1.1">
       <tr><th colspan="4" scope="rowgroup">
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1/reference/bidi-004-ref.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1/reference/bidi-004-ref.xht
new file mode 100644
index 00000000000..9a68a9c2911
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1/reference/bidi-004-ref.xht
@@ -0,0 +1,33 @@
+<!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="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <meta name="flags" content="ahem" />
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest-toc.xht
index 5da9e0daf09..8a315b2bfb0 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest-toc.xht
@@ -24,6 +24,14 @@
         <th>Flags</th>
       </tr>
     </thead>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="css3-text-line-break-jazh-001" class="font">
       <tr>
         <td rowspan="1" title="CSS3 Text, linebreaks: 3041 HIRAGANA LETTER SMALL A (strict,ja)">
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest.list
index b33697dfeb1..f864e053657 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1/reftest.list
@@ -1,4 +1,5 @@
 
+bidi-004.xht == reference/bidi-004-ref.xht
 css3-text-line-break-jazh-001.xht == reference/css3-text-line-break-jazh-001-ref.xht
 css3-text-line-break-jazh-002.xht == reference/css3-text-line-break-jazh-002-ref.xht
 css3-text-line-break-jazh-003.xht == reference/css3-text-line-break-jazh-003-ref.xht
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1/toc.xht
index db79beffa8f..5b416ae07ae 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1/toc.xht
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         White Space Processing Details</a></th>
-      <td>(26 Tests)</td></tr>
+      <td>(27 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/bidi-004.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/bidi-004.xht
new file mode 100644
index 00000000000..c831ede87e0
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/bidi-004.xht
@@ -0,0 +1,53 @@
+<!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" lang="en" xml:lang="en">
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test bidi-004"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules" />
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="http://unicode.org/reports/tr9/" />
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0" /> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.xht" />
+
+  <meta name="flags" content="may21 ahem" />
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp ‮ ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX ‬ XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/chapter-4.xht
index 538c41d166e..000254be6c3 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/chapter-4.xht
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/chapter-4.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Module Level 3 CR Test Suite</h1>
-  <h2>White Space Processing Details (26 tests)</h2>
+  <h2>White Space Processing Details (27 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -43,7 +43,15 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.1">+</a>
         <a href="http://www.w3.org/TR/css-text-3/#white-space-rules">4.1 The White Space Processing Rules</a></th></tr>
-      <!-- 0 tests -->
+      <!-- 1 tests -->
+      <tr id="bidi-004-4.1" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
     </tbody>
     <tbody id="s4.1.1">
       <tr><th colspan="4" scope="rowgroup">
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reference/bidi-004-ref.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reference/bidi-004-ref.xht
new file mode 100644
index 00000000000..bb3ef0423d3
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reference/bidi-004-ref.xht
@@ -0,0 +1,42 @@
+<!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 Text Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test bidi-004-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <meta name="flags" content="ahem" />
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest-toc.xht
index 5da9e0daf09..8a315b2bfb0 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest-toc.xht
@@ -24,6 +24,14 @@
         <th>Flags</th>
       </tr>
     </thead>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="css3-text-line-break-jazh-001" class="font">
       <tr>
         <td rowspan="1" title="CSS3 Text, linebreaks: 3041 HIRAGANA LETTER SMALL A (strict,ja)">
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest.list
index b33697dfeb1..f864e053657 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/reftest.list
@@ -1,4 +1,5 @@
 
+bidi-004.xht == reference/bidi-004-ref.xht
 css3-text-line-break-jazh-001.xht == reference/css3-text-line-break-jazh-001-ref.xht
 css3-text-line-break-jazh-002.xht == reference/css3-text-line-break-jazh-002-ref.xht
 css3-text-line-break-jazh-003.xht == reference/css3-text-line-break-jazh-003-ref.xht
diff --git a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/toc.xht
index db79beffa8f..5b416ae07ae 100644
--- a/tests/wpt/css-tests/css-text-3_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-text-3_dev/xhtml1print/toc.xht
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         White Space Processing Details</a></th>
-      <td>(26 Tests)</td></tr>
+      <td>(27 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-2.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-2.htm
index e127f1563b5..10c2ec4e593 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-2.htm
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/chapter-2.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Decoration Module Level 3 CR Test Suite</h1>
-  <h2>Line Decoration: Underline, Overline, and Strike-Through (14 tests)</h2>
+  <h2>Line Decoration: Underline, Overline, and Strike-Through (20 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -192,7 +192,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.6">+</a>
         <a href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property">2.6 Text Underline Position: the &#8216;text-underline-position&#8217; property</a></th></tr>
-      <!-- 7 tests -->
+      <!-- 13 tests -->
       <tr id="text-underline-position-alphabetic-001-2.6" class="primary ahem">
         <td><strong>
             <a href="text-underline-position-alphabetic-001.htm">text-underline-position-alphabetic-001</a></strong></td>
@@ -270,6 +270,72 @@
           </ul>
         </td>
       </tr>
+      <tr id="underline-font-size-vlr-003-2.6" class="">
+        <td>
+            <a href="underline-font-size-vlr-003.htm">underline-font-size-vlr-003</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vlr-005-2.6" class="">
+        <td>
+            <a href="underline-font-size-vlr-005.htm">underline-font-size-vlr-005</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-002-2.6" class="">
+        <td>
+            <a href="underline-font-size-vrl-002.htm">underline-font-size-vrl-002</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-004-2.6" class="">
+        <td>
+            <a href="underline-font-size-vrl-004.htm">underline-font-size-vrl-004</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vlr-003-2.6" class="">
+        <td>
+            <a href="underline-mixed-vlr-003.htm">underline-mixed-vlr-003</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vrl-002-2.6" class="">
+        <td>
+            <a href="underline-mixed-vrl-002.htm">underline-mixed-vrl-002</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s2.6.#fig-text-underline-position">
       <!-- 0 tests -->
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 62c604cdaf7..ecd0de4d836 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
@@ -27,7 +27,7 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.htm">Chapter 2 - 
         Line Decoration: Underline, Overline, and Strike-Through</a></th>
-      <td>(14 Tests)</td></tr>
+      <td>(20 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.htm">Chapter 3 - 
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vlr-003.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vlr-003.htm
new file mode 100644
index 00000000000..e942aadd0f6
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vlr-003.htm
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn">ᠨ<span id="larger">ᠨᠨ</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vlr-005.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vlr-005.htm
new file mode 100644
index 00000000000..b14f5e51b5f
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vlr-005.htm
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn">ᠨ<span id="larger" lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vrl-002.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vrl-002.htm
new file mode 100644
index 00000000000..6d1498fd6bf
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vrl-002.htm
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja">方<span id="larger">方方</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vrl-004.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vrl-004.htm
new file mode 100644
index 00000000000..c751d937df9
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-font-size-vrl-004.htm
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja">方<span id="larger" lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-mixed-vlr-003.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-mixed-vlr-003.htm
new file mode 100644
index 00000000000..f4d0e56c110
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-mixed-vlr-003.htm
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn">ᠨ<span lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-mixed-vrl-002.htm b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-mixed-vrl-002.htm
new file mode 100644
index 00000000000..6615b3f5485
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/html/underline-mixed-vrl-002.htm
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja">方<span lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
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 a27c9097b2f..78fe730c0b0 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
@@ -47,3 +47,15 @@ html/text-underline-position-right-002.htm	58dc96adf3a515eea76558481f13d6fa76fa7
 xhtml1/text-underline-position-right-002.xht	58dc96adf3a515eea76558481f13d6fa76fa7377	?
 html/text-underline-position-under-001.htm	859f9df320e8eddb0c876e5cae8eef78cff1afbc	?
 xhtml1/text-underline-position-under-001.xht	859f9df320e8eddb0c876e5cae8eef78cff1afbc	?
+html/underline-font-size-vlr-003.htm	05a00f9e67ec770a68184f514da16d42f3664b4e	?
+xhtml1/underline-font-size-vlr-003.xht	05a00f9e67ec770a68184f514da16d42f3664b4e	?
+html/underline-font-size-vlr-005.htm	cf494cde416df9487dabe224857d7c09849b13a7	?
+xhtml1/underline-font-size-vlr-005.xht	cf494cde416df9487dabe224857d7c09849b13a7	?
+html/underline-font-size-vrl-002.htm	fde426aff2dd0f2666881af719f8a933595db5e5	?
+xhtml1/underline-font-size-vrl-002.xht	fde426aff2dd0f2666881af719f8a933595db5e5	?
+html/underline-font-size-vrl-004.htm	b37f8604be0f98e2fb03f2f2198170017232ece1	?
+xhtml1/underline-font-size-vrl-004.xht	b37f8604be0f98e2fb03f2f2198170017232ece1	?
+html/underline-mixed-vlr-003.htm	ffd107c6592a7876badaee2070b4aac10886bbc3	?
+xhtml1/underline-mixed-vlr-003.xht	ffd107c6592a7876badaee2070b4aac10886bbc3	?
+html/underline-mixed-vrl-002.htm	233697bcbc7031e4901fe8df986802a06698c850	?
+xhtml1/underline-mixed-vrl-002.xht	233697bcbc7031e4901fe8df986802a06698c850	?
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 dabd517b835..8ac1360d011 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
@@ -133,6 +133,7 @@
   <ul>
     <li>Cameron McCormack</li>
     <li>Fuyuko Ikeguchi</li>
+    <li>G&eacute;rard Talbot</li>
     <li>Kazuaki Takemura</li>
     <li>Shinsuke Matsuki</li>
     <li>Taka Oshiyama</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 b8d9d536b74..65aba43634f 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
@@ -133,6 +133,7 @@
   <ul>
     <li>Cameron McCormack</li>
     <li>Fuyuko Ikeguchi</li>
+    <li>G&eacute;rard Talbot</li>
     <li>Kazuaki Takemura</li>
     <li>Shinsuke Matsuki</li>
     <li>Taka Oshiyama</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 41f4c9b3bb9..fd5399f1151 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
@@ -21,3 +21,9 @@ text-underline-position-left-002		text-underline-position - left in vertical wri
 text-underline-position-right-001		text-underline-position - right	ahem	http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property	9a87883e72baf49dca5ef85b1a77926074a7d47e	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This tests checks that there is underline in a position under the descenders.
 text-underline-position-right-002		text-underline-position - right in vertical writing mode	ahem	http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property	58dc96adf3a515eea76558481f13d6fa76fa7377	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This tests checks that there is underline to the right of the text in vertical writing mode.
 text-underline-position-under-001		text-underline-position - under	ahem	http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property	859f9df320e8eddb0c876e5cae8eef78cff1afbc	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This tests checks that there is underline in a position under the descenders.
+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	05a00f9e67ec770a68184f514da16d42f3664b4e	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+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	cf494cde416df9487dabe224857d7c09849b13a7	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+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	fde426aff2dd0f2666881af719f8a933595db5e5	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+underline-font-size-vrl-004		'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	b37f8604be0f98e2fb03f2f2198170017232ece1	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+underline-mixed-vlr-003		'text-decoration: underline' 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	ffd107c6592a7876badaee2070b4aac10886bbc3	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.
+underline-mixed-vrl-002		'text-decoration: underline' 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	233697bcbc7031e4901fe8df986802a06698c850	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-2.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-2.xht
index b1fea429fa4..79c3ded6442 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-2.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/chapter-2.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Decoration Module Level 3 CR Test Suite</h1>
-  <h2>Line Decoration: Underline, Overline, and Strike-Through (14 tests)</h2>
+  <h2>Line Decoration: Underline, Overline, and Strike-Through (20 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -192,7 +192,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.6">+</a>
         <a href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property">2.6 Text Underline Position: the &#8216;text-underline-position&#8217; property</a></th></tr>
-      <!-- 7 tests -->
+      <!-- 13 tests -->
       <tr id="text-underline-position-alphabetic-001-2.6" class="primary ahem">
         <td><strong>
             <a href="text-underline-position-alphabetic-001.xht">text-underline-position-alphabetic-001</a></strong></td>
@@ -270,6 +270,72 @@
           </ul>
         </td>
       </tr>
+      <tr id="underline-font-size-vlr-003-2.6" class="">
+        <td>
+            <a href="underline-font-size-vlr-003.xht">underline-font-size-vlr-003</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vlr-005-2.6" class="">
+        <td>
+            <a href="underline-font-size-vlr-005.xht">underline-font-size-vlr-005</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-002-2.6" class="">
+        <td>
+            <a href="underline-font-size-vrl-002.xht">underline-font-size-vrl-002</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-004-2.6" class="">
+        <td>
+            <a href="underline-font-size-vrl-004.xht">underline-font-size-vrl-004</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vlr-003-2.6" class="">
+        <td>
+            <a href="underline-mixed-vlr-003.xht">underline-mixed-vlr-003</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vrl-002-2.6" class="">
+        <td>
+            <a href="underline-mixed-vrl-002.xht">underline-mixed-vrl-002</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s2.6.#fig-text-underline-position">
       <!-- 0 tests -->
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 a6103f27442..e92802e43df 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
@@ -27,7 +27,7 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.xht">Chapter 2 - 
         Line Decoration: Underline, Overline, and Strike-Through</a></th>
-      <td>(14 Tests)</td></tr>
+      <td>(20 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vlr-003.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vlr-003.xht
new file mode 100644
index 00000000000..07f7f85df49
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vlr-003.xht
@@ -0,0 +1,49 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger">ᠨᠨ</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vlr-005.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vlr-005.xht
new file mode 100644
index 00000000000..5955b906811
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vlr-005.xht
@@ -0,0 +1,48 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger" lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vrl-002.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vrl-002.xht
new file mode 100644
index 00000000000..653f2ce4c26
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vrl-002.xht
@@ -0,0 +1,49 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger">方方</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vrl-004.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vrl-004.xht
new file mode 100644
index 00000000000..cd2b6bd765b
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-font-size-vrl-004.xht
@@ -0,0 +1,48 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger" lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-mixed-vlr-003.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-mixed-vlr-003.xht
new file mode 100644
index 00000000000..edc5b9fc1dd
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-mixed-vlr-003.xht
@@ -0,0 +1,43 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-mixed-vrl-002.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-mixed-vrl-002.xht
new file mode 100644
index 00000000000..9eef283dd9f
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1/underline-mixed-vrl-002.xht
@@ -0,0 +1,43 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-2.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-2.xht
index b1fea429fa4..79c3ded6442 100644
--- a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-2.xht
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/chapter-2.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Text Decoration Module Level 3 CR Test Suite</h1>
-  <h2>Line Decoration: Underline, Overline, and Strike-Through (14 tests)</h2>
+  <h2>Line Decoration: Underline, Overline, and Strike-Through (20 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -192,7 +192,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.6">+</a>
         <a href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property">2.6 Text Underline Position: the &#8216;text-underline-position&#8217; property</a></th></tr>
-      <!-- 7 tests -->
+      <!-- 13 tests -->
       <tr id="text-underline-position-alphabetic-001-2.6" class="primary ahem">
         <td><strong>
             <a href="text-underline-position-alphabetic-001.xht">text-underline-position-alphabetic-001</a></strong></td>
@@ -270,6 +270,72 @@
           </ul>
         </td>
       </tr>
+      <tr id="underline-font-size-vlr-003-2.6" class="">
+        <td>
+            <a href="underline-font-size-vlr-003.xht">underline-font-size-vlr-003</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vlr-005-2.6" class="">
+        <td>
+            <a href="underline-font-size-vlr-005.xht">underline-font-size-vlr-005</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-002-2.6" class="">
+        <td>
+            <a href="underline-font-size-vrl-002.xht">underline-font-size-vrl-002</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-004-2.6" class="">
+        <td>
+            <a href="underline-font-size-vrl-004.xht">underline-font-size-vrl-004</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vlr-003-2.6" class="">
+        <td>
+            <a href="underline-mixed-vlr-003.xht">underline-mixed-vlr-003</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vrl-002-2.6" class="">
+        <td>
+            <a href="underline-mixed-vrl-002.xht">underline-mixed-vrl-002</a></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s2.6.#fig-text-underline-position">
       <!-- 0 tests -->
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 a6103f27442..e92802e43df 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
@@ -27,7 +27,7 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.xht">Chapter 2 - 
         Line Decoration: Underline, Overline, and Strike-Through</a></th>
-      <td>(14 Tests)</td></tr>
+      <td>(20 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vlr-003.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vlr-003.xht
new file mode 100644
index 00000000000..cf8ad4361c0
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vlr-003.xht
@@ -0,0 +1,58 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Decoration Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test underline-font-size-vlr-003"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger">ᠨᠨ</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vlr-005.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vlr-005.xht
new file mode 100644
index 00000000000..c93b1ae8976
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vlr-005.xht
@@ -0,0 +1,57 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Decoration Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test underline-font-size-vlr-005"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger" lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vrl-002.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vrl-002.xht
new file mode 100644
index 00000000000..13e4b75f652
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vrl-002.xht
@@ -0,0 +1,58 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Decoration Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test underline-font-size-vrl-002"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger">方方</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vrl-004.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vrl-004.xht
new file mode 100644
index 00000000000..da6b5c28ea1
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-font-size-vrl-004.xht
@@ -0,0 +1,57 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Decoration Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test underline-font-size-vrl-004"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger" lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-mixed-vlr-003.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-mixed-vlr-003.xht
new file mode 100644
index 00000000000..40891509c61
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-mixed-vlr-003.xht
@@ -0,0 +1,52 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Decoration Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test underline-mixed-vlr-003"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-mixed-vrl-002.xht b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-mixed-vrl-002.xht
new file mode 100644
index 00000000000..ec16d721814
--- /dev/null
+++ b/tests/wpt/css-tests/css-text-decor-3_dev/xhtml1print/underline-mixed-vrl-002.xht
@@ -0,0 +1,52 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Text Decoration Module Level 3 CR Test Suite"; }
+            @top-right { content: "Test underline-mixed-vrl-002"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/html/reference/transform-scale-test-ref.htm b/tests/wpt/css-tests/css-transforms-1_dev/html/reference/transform-scale-test-ref.htm
index 91d9015a227..3f0822e8162 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/html/reference/transform-scale-test-ref.htm
+++ b/tests/wpt/css-tests/css-transforms-1_dev/html/reference/transform-scale-test-ref.htm
@@ -7,8 +7,8 @@
             background-color: green;
             float: left;
             margin: 50px;
-            width: 33px;
-            height: 33px;
+            width: 30px;
+            height: 30px;
         }
     </style>
 </head>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/html/scale-optional-second-001.htm b/tests/wpt/css-tests/css-transforms-1_dev/html/scale-optional-second-001.htm
index 788ee5e7c20..743900125a3 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/html/scale-optional-second-001.htm
+++ b/tests/wpt/css-tests/css-transforms-1_dev/html/scale-optional-second-001.htm
@@ -18,10 +18,10 @@
         }
         .redSquare {
             position: absolute;
-            top: 51px;
-            left: 51px;
-            width: 198px;
-            height: 198px;
+            top: 52px;
+            left: 52px;
+            width: 196px;
+            height: 196px;
             background: red;
         }
     </style>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/html/transform-scale-test.htm b/tests/wpt/css-tests/css-transforms-1_dev/html/transform-scale-test.htm
index 0e967330b58..7824d489620 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/html/transform-scale-test.htm
+++ b/tests/wpt/css-tests/css-transforms-1_dev/html/transform-scale-test.htm
@@ -14,12 +14,12 @@
         .greenSquare {
             width: 100px;
             height: 100px;
-            transform: scale(.33);
+            transform: scale(.3);
             transform-origin: top left;
         }
         .greenSquareTwo {
-            width: 33px;
-            height: 33px;
+            width: 30px;
+            height: 30px;
         }
     </style>
 </head>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-transforms-1_dev/implementation-report-TEMPLATE.data
index 6b37078ef38..2809c468286 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-transforms-1_dev/implementation-report-TEMPLATE.data
@@ -159,8 +159,8 @@ html/rotate_y_45deg.htm	676a7db8531f14d928be06c2aa384aff3701e759	?
 xhtml1/rotate_y_45deg.xht	676a7db8531f14d928be06c2aa384aff3701e759	?
 html/rotatey.htm	f4e3440dfbc15922fb037d7340c9eb4218c4254e	?
 xhtml1/rotatey.xht	f4e3440dfbc15922fb037d7340c9eb4218c4254e	?
-html/scale-optional-second-001.htm	98c8393e60b87675e850812e29e1aae19b746a03	?
-xhtml1/scale-optional-second-001.xht	98c8393e60b87675e850812e29e1aae19b746a03	?
+html/scale-optional-second-001.htm	e63c550d1a7f24e7e7668ad94f78da65ac6d38cb	?
+xhtml1/scale-optional-second-001.xht	e63c550d1a7f24e7e7668ad94f78da65ac6d38cb	?
 html/scale-zero-001.htm	2caa488dc20a00d72db606b2da9dfb6eae4ee03f	?
 xhtml1/scale-zero-001.xht	2caa488dc20a00d72db606b2da9dfb6eae4ee03f	?
 html/scalex.htm	c1e4f598f137270b4b44ef485bd3e5b4d30f3601	?
@@ -1847,8 +1847,8 @@ html/transform-scale-002.htm	5aa28a98dad5e3d4b30fc1adcf73fe48f3cf5678	?
 xhtml1/transform-scale-002.xht	5aa28a98dad5e3d4b30fc1adcf73fe48f3cf5678	?
 html/transform-scale-percent-001.htm	be0330c5c76b45462bcf59cd5372da782fd54a90	?
 xhtml1/transform-scale-percent-001.xht	be0330c5c76b45462bcf59cd5372da782fd54a90	?
-html/transform-scale-test.htm	1e3cec06b241ed8d491ee9517110230074b820cc	?
-xhtml1/transform-scale-test.xht	1e3cec06b241ed8d491ee9517110230074b820cc	?
+html/transform-scale-test.htm	cfd337615844669616aea35fab2dbe6c6c5dbf86	?
+xhtml1/transform-scale-test.xht	cfd337615844669616aea35fab2dbe6c6c5dbf86	?
 html/transform-scalex-001.htm	a528c8b6de5b1fec0124840b9875fb6399d76d69	?
 xhtml1/transform-scalex-001.xht	a528c8b6de5b1fec0124840b9875fb6399d76d69	?
 html/transform-scaley-001.htm	79a6a9f378b6e09407f2a3b21302a312c691f1d3	?
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/testinfo.data b/tests/wpt/css-tests/css-transforms-1_dev/testinfo.data
index 6c2bd060400..444b3d873f3 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-transforms-1_dev/testinfo.data
@@ -77,7 +77,7 @@ rotate_45deg	reference/rotate_45deg-ref	rotateY with perspective produces a trap
 rotate_x_45deg	reference/rotate_x_45deg-ref	rotateX with perspective produces a trapezoid		http://www.w3.org/TR/css-transforms-1/#3d-transform-rendering	9c1ea67ac3b42ac5eb521c40bd640dd943d07a0e	`Ebay Inc.`<xiatian@ebay.com>	Rotate 45 degree in y axis
 rotate_y_45deg	reference/rotate_y_45deg-ref	rotateY with perspective produces a trapezoid		http://www.w3.org/TR/css-transforms-1/#3d-transform-rendering	676a7db8531f14d928be06c2aa384aff3701e759	`Ebay Inc.`<xiatian@ebay.com>	Rotate 45 degree in y axis
 rotateY	reference/rotateY-ref	transform property with rotateY		http://www.w3.org/TR/css-transforms-1/#funcdef-rotatey	f4e3440dfbc15922fb037d7340c9eb4218c4254e	`Zou Rui`<mailto:zrxldl@gmail.com>	When the value of transform is 'rotateY(90deg)', the foward side of a transformed element disappears.
-scale-optional-second-001	reference/scale-optional-second-ref	transform property with scale function and one parameter		http://www.w3.org/TR/css-transforms-1/#transform-property,http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions	98c8393e60b87675e850812e29e1aae19b746a03	`Jian Zhang`<mailto:jian.andy.zhang@gmail.com>	If the second parameter of scale function is not provided, it takes a value equal to the first. This transform causes the element to appear twice as long in both the X and Y axes.
+scale-optional-second-001	reference/scale-optional-second-ref	transform property with scale function and one parameter		http://www.w3.org/TR/css-transforms-1/#transform-property,http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions	e63c550d1a7f24e7e7668ad94f78da65ac6d38cb	`Jian Zhang`<mailto:jian.andy.zhang@gmail.com>	If the second parameter of scale function is not provided, it takes a value equal to the first. This transform causes the element to appear twice as long in both the X and Y axes.
 scale-zero-001	reference/scale-zero-ref	transform property with scale function and zero values		http://www.w3.org/TR/css-transforms-1/#transform-property,http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions	2caa488dc20a00d72db606b2da9dfb6eae4ee03f	`Jian Zhang`<mailto:jian.andy.zhang@gmail.com>	If zero value is passed to scale function, it causes the element to disappear.
 scalex	reference/scalex-ref	test scale x		http://www.w3.org/TR/css-transforms-1/#3d-transform-rendering	c1e4f598f137270b4b44ef485bd3e5b4d30f3601	`Ebay Inc.`<xiatian@ebay.com>	scale x 2
 scaley	reference/scaley-ref	test scale y		http://www.w3.org/TR/css-transforms-1/#3d-transform-rendering	a4b5a1c1981a3ffc953963bf4a331aabd19525c6	`Ebay Inc.`<xiatian@ebay.com>	scale y 2
@@ -921,7 +921,7 @@ transform-rounding-001	reference/transform-rounding-ref	Rounding		http://www.w3.
 transform-scale-001	reference/transform-scale-ref	scale(0.5, 0.5)		http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions,http://www.w3.org/TR/css-transforms-1/#funcdef-scale	43f0e3fc3729f272e8fcd4881fa69b8b31aacda2	`Clint Talbert`<mailto:ctalbert@mozilla.com>,`Aryeh Gregor`<mailto:ayg@aryeh.name>	This tests that scale(0.5, 0.5) scales down a box by a factor of one-half.
 transform-scale-002	reference/transform-scale-ref	scale(0.5)		http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions,http://www.w3.org/TR/css-transforms-1/#funcdef-scale	5aa28a98dad5e3d4b30fc1adcf73fe48f3cf5678	`Clint Talbert`<mailto:ctalbert@mozilla.com>,`Aryeh Gregor`<mailto:ayg@aryeh.name>	This tests that scale(0.5) scales down a box by a factor of one-half.
 transform-scale-percent-001	reference/transform-scale-percent-ref	scale(50%, 50%)		http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions,http://www.w3.org/TR/css-transforms-1/#funcdef-scale	be0330c5c76b45462bcf59cd5372da782fd54a90	`Clint Talbert`<mailto:ctalbert@mozilla.com>,`Aryeh Gregor`<mailto:ayg@aryeh.name>	This tests that scale(50%, 50%) does nothing, because scale() is defined to take numbers and not percentages.
-transform-scale-test	reference/transform-scale-test-ref	transform property with scale function.		http://www.w3.org/TR/css-transforms-1/#transform-property	1e3cec06b241ed8d491ee9517110230074b820cc	`Oleg Janeiko`<mailto:oleg@the-incredible.me>	This transform shrinks a container by calling scale(.33). It also sets transform-origin to top left in order to visually align with the second green square.
+transform-scale-test	reference/transform-scale-test-ref	transform property with scale function.		http://www.w3.org/TR/css-transforms-1/#transform-property	cfd337615844669616aea35fab2dbe6c6c5dbf86	`Oleg Janeiko`<mailto:oleg@the-incredible.me>	This transform shrinks a container by calling scale(.33). It also sets transform-origin to top left in order to visually align with the second green square.
 transform-scalex-001	reference/transform-scalex-ref	scaleX(0.5)		http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions,http://www.w3.org/TR/css-transforms-1/#funcdef-scalex	a528c8b6de5b1fec0124840b9875fb6399d76d69	`Clint Talbert`<mailto:ctalbert@mozilla.com>,`Aryeh Gregor`<mailto:ayg@aryeh.name>	This tests that scaleX(0.5) scales down a box's width by a factor of one-half.
 transform-scaley-001	reference/transform-scaley-ref	scaleY(0.5)		http://www.w3.org/TR/css-transforms-1/#two-d-transform-functions,http://www.w3.org/TR/css-transforms-1/#funcdef-scaley	79a6a9f378b6e09407f2a3b21302a312c691f1d3	`Clint Talbert`<mailto:ctalbert@mozilla.com>,`Aryeh Gregor`<mailto:ayg@aryeh.name>	This tests that scaleY(0.5) scales down a box's width by a factor of one-half.
 transform-singular-001	reference/transform-singular-ref	matrix(1, 1, 1, 1, 0, 0)		http://www.w3.org/TR/css-transforms-1/#transform-function-lists	1930c56b49c9941b0ddec2813d544e9a9245572e	`Keith Schwarz`<mailto:keith@keithschwarz.com>,`Aryeh Gregor`<mailto:ayg@aryeh.name>	"If a transform function causes the current transformation matrix (CTM) of an object to be non-invertible, the object and its content do not get displayed." The matrix (1, 1, 1, 1) has determinant 1*1 - 1*1 = 0 and therefore is not invertible, so nothing should display.
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/reference/transform-scale-test-ref.xht b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/reference/transform-scale-test-ref.xht
index d8edd27cff9..3976cb2cfe7 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/reference/transform-scale-test-ref.xht
+++ b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/reference/transform-scale-test-ref.xht
@@ -7,8 +7,8 @@
             background-color: green;
             float: left;
             margin: 50px;
-            width: 33px;
-            height: 33px;
+            width: 30px;
+            height: 30px;
         }
     </style>
 </head>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/scale-optional-second-001.xht b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/scale-optional-second-001.xht
index 7b84d476944..0c4c5f7a650 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/scale-optional-second-001.xht
+++ b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/scale-optional-second-001.xht
@@ -18,10 +18,10 @@
         }
         .redSquare {
             position: absolute;
-            top: 51px;
-            left: 51px;
-            width: 198px;
-            height: 198px;
+            top: 52px;
+            left: 52px;
+            width: 196px;
+            height: 196px;
             background: red;
         }
     </style>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/transform-scale-test.xht b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/transform-scale-test.xht
index bde2e9acbf5..1a0ba07ec0f 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/transform-scale-test.xht
+++ b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1/transform-scale-test.xht
@@ -14,12 +14,12 @@
         .greenSquare {
             width: 100px;
             height: 100px;
-            transform: scale(.33);
+            transform: scale(.3);
             transform-origin: top left;
         }
         .greenSquareTwo {
-            width: 33px;
-            height: 33px;
+            width: 30px;
+            height: 30px;
         }
     </style>
 </head>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/reference/transform-scale-test-ref.xht b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/reference/transform-scale-test-ref.xht
index d8edd27cff9..3976cb2cfe7 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/reference/transform-scale-test-ref.xht
+++ b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/reference/transform-scale-test-ref.xht
@@ -7,8 +7,8 @@
             background-color: green;
             float: left;
             margin: 50px;
-            width: 33px;
-            height: 33px;
+            width: 30px;
+            height: 30px;
         }
     </style>
 </head>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/scale-optional-second-001.xht b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/scale-optional-second-001.xht
index 7b84d476944..0c4c5f7a650 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/scale-optional-second-001.xht
+++ b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/scale-optional-second-001.xht
@@ -18,10 +18,10 @@
         }
         .redSquare {
             position: absolute;
-            top: 51px;
-            left: 51px;
-            width: 198px;
-            height: 198px;
+            top: 52px;
+            left: 52px;
+            width: 196px;
+            height: 196px;
             background: red;
         }
     </style>
diff --git a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/transform-scale-test.xht b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/transform-scale-test.xht
index bde2e9acbf5..1a0ba07ec0f 100644
--- a/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/transform-scale-test.xht
+++ b/tests/wpt/css-tests/css-transforms-1_dev/xhtml1print/transform-scale-test.xht
@@ -14,12 +14,12 @@
         .greenSquare {
             width: 100px;
             height: 100px;
-            transform: scale(.33);
+            transform: scale(.3);
             transform-origin: top left;
         }
         .greenSquareTwo {
-            width: 33px;
-            height: 33px;
+            width: 30px;
+            height: 30px;
         }
     </style>
 </head>
diff --git a/tests/wpt/css-tests/css-ui-3_dev/html/chapter-6.htm b/tests/wpt/css-tests/css-ui-3_dev/html/chapter-6.htm
index 633e7446e8e..05d79bb4627 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/html/chapter-6.htm
+++ b/tests/wpt/css-tests/css-ui-3_dev/html/chapter-6.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Basic User Interface Module Level 3 CR Test Suite</h1>
-  <h2>Pointing Devices and Keyboards (144 tests)</h2>
+  <h2>Pointing Devices and Keyboards (145 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -43,7 +43,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s6.1.1">+</a>
         <a href="http://www.w3.org/TR/css3-ui/#cursor">6.1.1 cursor property</a></th></tr>
-      <!-- 56 tests -->
+      <!-- 57 tests -->
       <tr id="cursor-image-001-6.1.1" class="primary image interact">
         <td><strong>
             <a href="cursor-image-001.htm">cursor-image-001</a></strong></td>
@@ -660,6 +660,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="select-cursor-001-manual-6.1.1" class="primary HTMLonly interact">
+        <td><strong>
+            <a href="select-cursor-001-manual.htm">select-cursor-001-manual</a></strong></td>
+        <td></td>
+        <td><abbr class="interact" title="Requires user interaction">Interact</abbr></td>
+        <td>cursor property and select element
+          <ul class="assert">
+            <li>Hovering the pointer over a select menu on top of an element with a cursor set should not display said cursor</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s6.1.1.#example-4a59cfe4">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-ui-3_dev/html/select-cursor-001-manual.htm b/tests/wpt/css-tests/css-ui-3_dev/html/select-cursor-001-manual.htm
new file mode 100644
index 00000000000..b1d968a3a8d
--- /dev/null
+++ b/tests/wpt/css-tests/css-ui-3_dev/html/select-cursor-001-manual.htm
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html><head>
+  <meta charset="utf-8">
+  <title>CSS Test (User Interface): cursor property and select element</title>
+  <link href="http://chrisrebert.com" rel="author" title="Chris Rebert">
+  <link href="https://drafts.csswg.org/css-ui-3/#cursor" rel="help">
+  <link href="https://drafts.csswg.org/css2/ui.html#cursor-props" rel="help">
+  <meta content="HTMLonly interact" name="flags">
+  <meta content="Hovering the pointer over a select menu on top of an element with a cursor set should not display said cursor" name="assert">
+  <style>
+div {
+  cursor: help;
+  height: 200px;
+  width: 200px;
+  background-color: blue;
+}
+  </style>
+</head>
+<body>
+  <ol>
+    <li>If clicking a &lt;select&gt; opens a native widget which is modal, then SKIP this test.</li>
+    <li>Click on the &lt;select&gt; below. A selection widget appears.</li>
+    <li>Move the pointer so that it is hovering within the intersection area of the selection widget and the blue box below.</li>
+    <li>If the "help" cursor is displayed, then the test result is FAILED. Otherwise, it is PASSED.</li>
+  </ol>
+  <select>
+    <option>AAAAAAAA</option>
+    <option>BBBBBBBB</option>
+    <option>CCCCCCCC</option>
+    <option>DDDDDDDD</option>
+    <option>EEEEEEEE</option>
+    <option>FFFFFFFF</option>
+    <option>GGGGGGGG</option>
+    <option>HHHHHHHH</option>
+  </select>
+  <div></div>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-ui-3_dev/html/toc.htm b/tests/wpt/css-tests/css-ui-3_dev/html/toc.htm
index 1d6e4af4e16..6f851b3ab28 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/html/toc.htm
+++ b/tests/wpt/css-tests/css-ui-3_dev/html/toc.htm
@@ -47,7 +47,7 @@
     <tbody id="s6">
       <tr><th><a href="chapter-6.htm">Chapter 6 - 
         Pointing Devices and Keyboards</a></th>
-      <td>(144 Tests)</td></tr>
+      <td>(145 Tests)</td></tr>
     </tbody>
     <tbody id="sA">
       <tr><th><a href="chapter-A.htm">Appendix A - 
diff --git a/tests/wpt/css-tests/css-ui-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-ui-3_dev/implementation-report-TEMPLATE.data
index 44be0ceb438..bb19fbadc6b 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-ui-3_dev/implementation-report-TEMPLATE.data
@@ -393,6 +393,7 @@ html/resize-006.htm	d65e14169ca073207b43fe4145e83c831b77a067	?
 xhtml1/resize-006.xht	d65e14169ca073207b43fe4145e83c831b77a067	?
 html/resize-007.htm	c0e4494f6e70369f227ec265ff2c14fb29323e66	?
 xhtml1/resize-007.xht	c0e4494f6e70369f227ec265ff2c14fb29323e66	?
+html/select-cursor-001-manual.htm	a28f3026bed183a42b3255b9e8983a9b0addbdec	?
 html/text-overflow-001.htm	18b85a5682895eec2a93d551dbe9d88d014f65b3	?
 xhtml1/text-overflow-001.xht	18b85a5682895eec2a93d551dbe9d88d014f65b3	?
 html/text-overflow-002.htm	9f4f4eae59abbf039c8743708235481c12751585	?
diff --git a/tests/wpt/css-tests/css-ui-3_dev/index.htm b/tests/wpt/css-tests/css-ui-3_dev/index.htm
index 2055f007c9e..8486ca5767f 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/index.htm
+++ b/tests/wpt/css-tests/css-ui-3_dev/index.htm
@@ -132,6 +132,7 @@
   <p>Many thanks to the following for their contributions:</p>
   <ul>
     <li>Chris Lilley</li>
+    <li>Chris Rebert</li>
     <li>Daniel Glazman</li>
     <li>Elika J. Etemad</li>
     <li>Florian Rivoal</li>
diff --git a/tests/wpt/css-tests/css-ui-3_dev/index.xht b/tests/wpt/css-tests/css-ui-3_dev/index.xht
index e153b7338c3..cb85387fb56 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/index.xht
+++ b/tests/wpt/css-tests/css-ui-3_dev/index.xht
@@ -132,6 +132,7 @@
   <p>Many thanks to the following for their contributions:</p>
   <ul>
     <li>Chris Lilley</li>
+    <li>Chris Rebert</li>
     <li>Daniel Glazman</li>
     <li>Elika J. Etemad</li>
     <li>Florian Rivoal</li>
diff --git a/tests/wpt/css-tests/css-ui-3_dev/testinfo.data b/tests/wpt/css-tests/css-ui-3_dev/testinfo.data
index bb6b66bcd29..29642183e88 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-ui-3_dev/testinfo.data
@@ -194,6 +194,7 @@ resize-004		resize initial value - none	interact	http://www.w3.org/TR/css3-ui/#r
 resize-005		resize - none - neither width nor height can be adjusted	interact	http://www.w3.org/TR/css3-ui/#resize	f868c41121e13b1963ac424f41bd7709c0d77f82	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that neither the width nor the height can be adjusted when resize set none
 resize-006		resize - vertical - only the height can be adjusted	interact	http://www.w3.org/TR/css3-ui/#resize	d65e14169ca073207b43fe4145e83c831b77a067	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that only the height can be adjusted when resize set vertical
 resize-007		resize - invalid without overflow property	interact	http://www.w3.org/TR/css3-ui/#resize	c0e4494f6e70369f227ec265ff2c14fb29323e66	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that resize property is invalid without overflow property
+select-cursor-001-manual		cursor property and select element	HTMLonly,interact	https://drafts.csswg.org/css-ui-3/#cursor,https://drafts.csswg.org/css2/ui.html#cursor-props	a28f3026bed183a42b3255b9e8983a9b0addbdec	`Chris Rebert`<http://chrisrebert.com>	Hovering the pointer over a select menu on top of an element with a cursor set should not display said cursor
 text-overflow-001	reference/text-overflow-001-ref	text-overflow - clip - the text inline content overflows will be broken		http://www.w3.org/TR/css3-ui/#text-overflow	18b85a5682895eec2a93d551dbe9d88d014f65b3	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that the inline content that overflows will be clipped. Characters may be only partially rendered when text-overflow set clip
 text-overflow-002	reference/text-overflow-002-ref	text-overflow - ellipsis - the broken textual content instead of ellipsis		http://www.w3.org/TR/css3-ui/#text-overflow	9f4f4eae59abbf039c8743708235481c12751585	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that an ellipsis (...) is shown instead of overflowing textual content
 text-overflow-003	reference/text-overflow-001-ref	text-overflow - inherit - inherit clip value of parent's text-overflow property		http://www.w3.org/TR/css3-ui/#text-overflow	dac3b5119c015760b3e5eb87122680eca10725c0	`Intel`<http://www.intel.com/>,`Shiyou Tan`<mailto:shiyoux.tan@intel.com>	Test checks that text-overflow inherits the parent' clip value when text-overflow set inherit
diff --git a/tests/wpt/css-tests/css-ui-3_dev/xhtml1/chapter-6.xht b/tests/wpt/css-tests/css-ui-3_dev/xhtml1/chapter-6.xht
index 9655761749d..3f33ab97efc 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/xhtml1/chapter-6.xht
+++ b/tests/wpt/css-tests/css-ui-3_dev/xhtml1/chapter-6.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Basic User Interface Module Level 3 CR Test Suite</h1>
-  <h2>Pointing Devices and Keyboards (144 tests)</h2>
+  <h2>Pointing Devices and Keyboards (145 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -43,7 +43,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s6.1.1">+</a>
         <a href="http://www.w3.org/TR/css3-ui/#cursor">6.1.1 cursor property</a></th></tr>
-      <!-- 56 tests -->
+      <!-- 57 tests -->
       <tr id="cursor-image-001-6.1.1" class="primary image interact">
         <td><strong>
             <a href="cursor-image-001.xht">cursor-image-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-ui-3_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-ui-3_dev/xhtml1/toc.xht
index 82d2780e785..de919d3e7be 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css-ui-3_dev/xhtml1/toc.xht
@@ -47,7 +47,7 @@
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
         Pointing Devices and Keyboards</a></th>
-      <td>(144 Tests)</td></tr>
+      <td>(145 Tests)</td></tr>
     </tbody>
     <tbody id="sA">
       <tr><th><a href="chapter-A.xht">Appendix A - 
diff --git a/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/chapter-6.xht b/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/chapter-6.xht
index 9655761749d..3f33ab97efc 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/chapter-6.xht
+++ b/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/chapter-6.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Basic User Interface Module Level 3 CR Test Suite</h1>
-  <h2>Pointing Devices and Keyboards (144 tests)</h2>
+  <h2>Pointing Devices and Keyboards (145 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -43,7 +43,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s6.1.1">+</a>
         <a href="http://www.w3.org/TR/css3-ui/#cursor">6.1.1 cursor property</a></th></tr>
-      <!-- 56 tests -->
+      <!-- 57 tests -->
       <tr id="cursor-image-001-6.1.1" class="primary image interact">
         <td><strong>
             <a href="cursor-image-001.xht">cursor-image-001</a></strong></td>
diff --git a/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/toc.xht
index 82d2780e785..de919d3e7be 100644
--- a/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-ui-3_dev/xhtml1print/toc.xht
@@ -47,7 +47,7 @@
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
         Pointing Devices and Keyboards</a></th>
-      <td>(144 Tests)</td></tr>
+      <td>(145 Tests)</td></tr>
     </tbody>
     <tbody id="sA">
       <tr><th><a href="chapter-A.xht">Appendix A - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/bidi-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/bidi-004.htm
new file mode 100644
index 00000000000..73639ffe3d4
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/bidi-004.htm
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+ <head>
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model">
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules">
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes">
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
+  <link rel="help" href="http://unicode.org/reports/tr9/">
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0"> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.htm">
+
+  <meta name="flags" content="may21 ahem">
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp &#x202E; ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX &#x202C; XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
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 cbba0d07751..142dccae30f 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 (162 tests)</h2>
+  <h2>Inline Direction and Bidirectionality (163 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -1613,7 +1613,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.4">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model">2.4 Box model for inline boxes in bidirectional context</a></th></tr>
-      <!-- 25 tests -->
+      <!-- 26 tests -->
       <tr id="bidi-001-2.4" class="primary">
         <td><strong>
             <a href="bidi-001.htm">bidi-001</a></strong></td>
@@ -1647,6 +1647,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-2.4" class="primary ahem may21">
+        <td><strong>
+            <a href="bidi-004.htm">bidi-004</a></strong></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-2.4" class="">
         <td>
             <a href="bidi-005.htm">bidi-005</a></td>
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 f802199c371..4e34a53ca88 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 (70 tests)</h2>
+  <h2>Inline-level Alignment (38 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -485,359 +485,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.4">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">4.4 Baseline Alignment</a></th></tr>
-      <!-- 32 tests -->
-      <tr id="vertical-alignment-002a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-002a.htm">vertical-alignment-002a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-002b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-002b.htm">vertical-alignment-002b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-003a.htm">vertical-alignment-003a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-003b.htm">vertical-alignment-003b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-005a.htm">vertical-alignment-005a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-005b.htm">vertical-alignment-005b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-008a.htm">vertical-alignment-008a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-008b.htm">vertical-alignment-008b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-011a.htm">vertical-alignment-011a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-011b.htm">vertical-alignment-011b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012l-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-012l.htm">vertical-alignment-012l</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012r-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-012r.htm">vertical-alignment-012r</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-014a.htm">vertical-alignment-014a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-014b.htm">vertical-alignment-014b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-015a.htm">vertical-alignment-015a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-015b.htm">vertical-alignment-015b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-017a.htm">vertical-alignment-017a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-017b.htm">vertical-alignment-017b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-018a.htm">vertical-alignment-018a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-018b.htm">vertical-alignment-018b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-020a.htm">vertical-alignment-020a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-020b.htm">vertical-alignment-020b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-021a.htm">vertical-alignment-021a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-021b.htm">vertical-alignment-021b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-023a.htm">vertical-alignment-023a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-023b.htm">vertical-alignment-023b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-024a.htm">vertical-alignment-024a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-024b.htm">vertical-alignment-024b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-026a.htm">vertical-alignment-026a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-026b.htm">vertical-alignment-026b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-027a.htm">vertical-alignment-027a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-027b.htm">vertical-alignment-027b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
+      <!-- 0 tests -->
     </tbody>
     <tbody id="s4.4.#dominant-baseline">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-7.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-7.htm
index ffd4f9e8a9d..fffd0cc397d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-7.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-7.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Abstract Box Layout (489 tests)</h2>
+  <h2>Abstract Box Layout (495 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -4637,7 +4637,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.5">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">7.5 Line-Relative Mappings</a></th></tr>
-      <!-- 26 tests -->
+      <!-- 32 tests -->
       <tr id="text-decoration-sidewaysleft-vlr-003-7.5" class="primary">
         <td><strong>
             <a href="text-decoration-sidewaysleft-vlr-003.htm">text-decoration-sidewaysleft-vlr-003</a></strong></td>
@@ -4836,10 +4836,76 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-002-7.5" class="primary ahem">
+      <tr id="underline-font-size-vlr-003-7.5" class="primary">
         <td><strong>
-            <a href="vertical-alignment-new-002.htm">vertical-alignment-new-002</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.htm">=</a> </td>
+            <a href="underline-font-size-vlr-003.htm">underline-font-size-vlr-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vlr-005-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vlr-005.htm">underline-font-size-vlr-005</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-002-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vrl-002.htm">underline-font-size-vrl-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-004-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vrl-004.htm">underline-font-size-vrl-004</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vlr-003-7.5" class="primary">
+        <td><strong>
+            <a href="underline-mixed-vlr-003.htm">underline-mixed-vlr-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vrl-002-7.5" class="primary">
+        <td><strong>
+            <a href="underline-mixed-vrl-002.htm">underline-mixed-vrl-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="vertical-alignment-002-7.5" class="primary ahem">
+        <td><strong>
+            <a href="vertical-alignment-002.htm">vertical-alignment-002</a></strong></td>
+        <td><a href="reference/vertical-alignment-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'top' and vertical-rl writing-mode
           <ul class="assert">
@@ -4847,10 +4913,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-003-7.5" class="primary ahem">
+      <tr id="vertical-alignment-003-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-003.htm">vertical-alignment-new-003</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.htm">=</a> </td>
+            <a href="vertical-alignment-003.htm">vertical-alignment-003</a></strong></td>
+        <td><a href="reference/vertical-alignment-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'top' and vertical-lr writing-mode
           <ul class="assert">
@@ -4858,10 +4924,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-004-7.5" class="primary ahem">
+      <tr id="vertical-alignment-004-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-004.htm">vertical-alignment-new-004</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.htm">=</a> </td>
+            <a href="vertical-alignment-004.htm">vertical-alignment-004</a></strong></td>
+        <td><a href="reference/vertical-alignment-004-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-top' and vertical-rl writing-mode
           <ul class="assert">
@@ -4869,10 +4935,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-005-7.5" class="primary ahem">
+      <tr id="vertical-alignment-005-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-005.htm">vertical-alignment-new-005</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.htm">=</a> </td>
+            <a href="vertical-alignment-005.htm">vertical-alignment-005</a></strong></td>
+        <td><a href="reference/vertical-alignment-004-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-top' and vertical-lr writing-mode
           <ul class="assert">
@@ -4880,10 +4946,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-006-7.5" class="primary ahem">
+      <tr id="vertical-alignment-006-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-006.htm">vertical-alignment-new-006</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.htm">=</a> </td>
+            <a href="vertical-alignment-006.htm">vertical-alignment-006</a></strong></td>
+        <td><a href="reference/vertical-alignment-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-bottom' and vertical-rl writing-mode
           <ul class="assert">
@@ -4891,10 +4957,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-007-7.5" class="primary ahem">
+      <tr id="vertical-alignment-007-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-007.htm">vertical-alignment-new-007</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.htm">=</a> </td>
+            <a href="vertical-alignment-007.htm">vertical-alignment-007</a></strong></td>
+        <td><a href="reference/vertical-alignment-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-bottom' and vertical-lr writing-mode
           <ul class="assert">
@@ -4902,10 +4968,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-008-7.5" class="primary ahem">
+      <tr id="vertical-alignment-008-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-008.htm">vertical-alignment-new-008</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.htm">=</a> </td>
+            <a href="vertical-alignment-008.htm">vertical-alignment-008</a></strong></td>
+        <td><a href="reference/vertical-alignment-008-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'bottom' and vertical-rl writing-mode
           <ul class="assert">
@@ -4913,10 +4979,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-009-7.5" class="primary ahem">
+      <tr id="vertical-alignment-009-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-009.htm">vertical-alignment-new-009</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.htm">=</a> </td>
+            <a href="vertical-alignment-009.htm">vertical-alignment-009</a></strong></td>
+        <td><a href="reference/vertical-alignment-008-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'bottom' and vertical-lr writing-mode
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/bidi-004-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/bidi-004-ref.htm
new file mode 100644
index 00000000000..66d853ab88b
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/bidi-004-ref.htm
@@ -0,0 +1,33 @@
+<!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="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+  <meta name="flags" content="ahem">
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm
index 4d95946e288..1b09afb5a99 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm
@@ -3,6 +3,7 @@
 <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-09-03 -->
   <meta name="flags" content="image">
   <style type="text/css">
     img
@@ -17,7 +18,7 @@
 
     img#orange
     {
-      padding-left: 120px; /* = the position of orange square */
+      margin-top: 30px;
     }
 
   </style>
@@ -29,7 +30,7 @@
 <p>Test passes if the right edge of an blue square is aligned with the left edge of a orange square.</p>
 
 <div>
-   <img id="blue" src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled"><br><!--
+   <img id="blue" src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled"><!--
 --><img id="orange" src="support/swatch-orange.png" width="30" height="30" alt="Image download support must be enabled">
 </div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm
index 5ce3eed605b..07c91edfa51 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm
@@ -3,6 +3,7 @@
 <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-09-01 -->
   <meta name="flags" content="image">
   <style type="text/css">
     img
@@ -12,13 +13,9 @@
 
     img
     {
-      padding-left: 60px; /* = the position of first orange square */
+      padding-left: 60px; /* =  position of orange squares */
     }
 
-    img + br + img
-    {
-      padding-left: 60px; /* = the position of second orange square*/
-    }
   </style>
 
 </head>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm
similarity index 65%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm
index 3e1a479b6f2..bc54054d77d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm
@@ -3,6 +3,7 @@
 <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-09-03 -->
   <meta name="flags" content="image">
   <style type="text/css">
     img
@@ -12,12 +13,12 @@
 
     img
     {
-      padding-left: 15px; /* = the position of first orange square */
+      padding-left: 60px; /* = the position of first orange square */
     }
 
     img + br + img
     {
-      padding-left: 15px; /* = the position of second orange square*/
+      padding-left: 90px; /* = the position of second orange square*/
     }
   </style>
 
@@ -25,7 +26,7 @@
 
 <body>
 
-<p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+<p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
 <div>
    <img src="support/swatch-orange.png" width="60" height="60" alt="Image download support must be enabled"><br><!--
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm
new file mode 100644
index 00000000000..72f180a427b
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm
@@ -0,0 +1,27 @@
+<!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-09-03 -->
+  <meta name="flags" content="image">
+  <style type="text/css">
+    img#orange
+    {
+      padding-left: 30px;
+    }
+  </style>
+
+</head>
+
+<body>
+
+<p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
+
+<div>
+  <img id="orange" src="support/swatch-orange.png" width="30" height="30" alt="Image download support must be enabled"><!--
+--><img src="support/swatch-blue.png" width="60" height="60" 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/vertical-alignment-new-008-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-008-ref.htm
deleted file mode 100644
index d74e5c73c4b..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/vertical-alignment-new-008-ref.htm
+++ /dev/null
@@ -1,31 +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">
-  <meta name="flags" content="image">
-  <style type="text/css">
-    img
-    {
-      vertical-align: top;
-    }
-
-    img#orange
-    {
-      padding-top: 60px; /* = the height of first character */
-    }
-  </style>
-
-</head>
-
-<body>
-
-<p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
-
-<div>
-   <img src="support/swatch-blue.png" width="120" height="120" alt="Image download support must be enabled"><!--
---><img id="orange" src="support/swatch-orange.png" width="60" height="60" 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/reftest-toc.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
index 5de5e9d8b03..7d36731d4c7 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
@@ -2208,6 +2208,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="bidi-011" class="">
       <tr>
         <td rowspan="1" title="The bidi algorithm and inlines in CSS wrapping bidi formatting characters">
@@ -5752,67 +5760,67 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-002" class="ahem">
+    <tbody id="vertical-alignment-002" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'top' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-002.htm">vertical-alignment-new-002</a></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.htm">=</a> </td>
+          <a href="vertical-alignment-002.htm">vertical-alignment-002</a></td>
+        <td><a href="reference/vertical-alignment-002-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-003" class="ahem">
+    <tbody id="vertical-alignment-003" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'top' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-003.htm">vertical-alignment-new-003</a></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.htm">=</a> </td>
+          <a href="vertical-alignment-003.htm">vertical-alignment-003</a></td>
+        <td><a href="reference/vertical-alignment-002-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-004" class="ahem">
+    <tbody id="vertical-alignment-004" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-top' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-004.htm">vertical-alignment-new-004</a></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.htm">=</a> </td>
+          <a href="vertical-alignment-004.htm">vertical-alignment-004</a></td>
+        <td><a href="reference/vertical-alignment-004-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-005" class="ahem">
+    <tbody id="vertical-alignment-005" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-top' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-005.htm">vertical-alignment-new-005</a></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.htm">=</a> </td>
+          <a href="vertical-alignment-005.htm">vertical-alignment-005</a></td>
+        <td><a href="reference/vertical-alignment-004-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-006" class="ahem">
+    <tbody id="vertical-alignment-006" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-bottom' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-006.htm">vertical-alignment-new-006</a></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.htm">=</a> </td>
+          <a href="vertical-alignment-006.htm">vertical-alignment-006</a></td>
+        <td><a href="reference/vertical-alignment-006-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-007" class="ahem">
+    <tbody id="vertical-alignment-007" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-bottom' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-007.htm">vertical-alignment-new-007</a></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.htm">=</a> </td>
+          <a href="vertical-alignment-007.htm">vertical-alignment-007</a></td>
+        <td><a href="reference/vertical-alignment-006-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-008" class="ahem">
+    <tbody id="vertical-alignment-008" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'bottom' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-008.htm">vertical-alignment-new-008</a></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.htm">=</a> </td>
+          <a href="vertical-alignment-008.htm">vertical-alignment-008</a></td>
+        <td><a href="reference/vertical-alignment-008-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-009" class="ahem">
+    <tbody id="vertical-alignment-009" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'bottom' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-009.htm">vertical-alignment-new-009</a></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.htm">=</a> </td>
+          <a href="vertical-alignment-009.htm">vertical-alignment-009</a></td>
+        <td><a href="reference/vertical-alignment-008-ref.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
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 ee94f681b5a..bebcf91e7aa 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
@@ -272,6 +272,7 @@ baseline-inline-replaced-003.htm == reference/baseline-inline-replaced-002-ref.h
 bidi-001.htm == reference/bidi-001-ref.htm
 bidi-002.htm == reference/bidi-002-ref.htm
 bidi-003.htm == reference/bidi-003-ref.htm
+bidi-004.htm == reference/bidi-004-ref.htm
 bidi-011.htm == reference/bidi-011-ref.htm
 bidi-box-model-001.htm == reference/bidi-box-model-001-ref.htm
 bidi-box-model-002.htm == reference/bidi-box-model-001-ref.htm
@@ -715,14 +716,14 @@ unicode-bidi-applies-to-012.htm == reference/direction-applies-to-008-ref.htm
 unicode-bidi-applies-to-013.htm == reference/direction-applies-to-008-ref.htm
 unicode-bidi-applies-to-014.htm == reference/direction-applies-to-008-ref.htm
 unicode-bidi-applies-to-015.htm == reference/direction-applies-to-008-ref.htm
-vertical-alignment-new-002.htm == reference/vertical-alignment-new-002-ref.htm
-vertical-alignment-new-003.htm == reference/vertical-alignment-new-002-ref.htm
-vertical-alignment-new-004.htm == reference/vertical-alignment-new-004-ref.htm
-vertical-alignment-new-005.htm == reference/vertical-alignment-new-004-ref.htm
-vertical-alignment-new-006.htm == reference/vertical-alignment-new-006-ref.htm
-vertical-alignment-new-007.htm == reference/vertical-alignment-new-006-ref.htm
-vertical-alignment-new-008.htm == reference/vertical-alignment-new-008-ref.htm
-vertical-alignment-new-009.htm == reference/vertical-alignment-new-008-ref.htm
+vertical-alignment-002.htm == reference/vertical-alignment-002-ref.htm
+vertical-alignment-003.htm == reference/vertical-alignment-002-ref.htm
+vertical-alignment-004.htm == reference/vertical-alignment-004-ref.htm
+vertical-alignment-005.htm == reference/vertical-alignment-004-ref.htm
+vertical-alignment-006.htm == reference/vertical-alignment-006-ref.htm
+vertical-alignment-007.htm == reference/vertical-alignment-006-ref.htm
+vertical-alignment-008.htm == reference/vertical-alignment-008-ref.htm
+vertical-alignment-009.htm == reference/vertical-alignment-008-ref.htm
 writing-mode-horizontal-001l.htm == reference/writing-mode-horizontal-001l-ref.htm
 writing-mode-horizontal-001r.htm == reference/writing-mode-horizontal-001r-ref.htm
 writing-mode-stretch-001.htm == reference/writing-mode-stretch-001-ref.htm
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 4346a4e2ad3..ff514e3e210 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,7 +27,7 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.htm">Chapter 2 - 
         Inline Direction and Bidirectionality</a></th>
-      <td>(162 Tests)</td></tr>
+      <td>(163 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.htm">Chapter 3 - 
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.htm">Chapter 4 - 
         Inline-level Alignment</a></th>
-      <td>(70 Tests)</td></tr>
+      <td>(38 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.htm">Chapter 5 - 
@@ -52,7 +52,7 @@
     <tbody id="s7">
       <tr><th><a href="chapter-7.htm">Chapter 7 - 
         Abstract Box Layout</a></th>
-      <td>(489 Tests)</td></tr>
+      <td>(495 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.htm">Chapter 8 - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vlr-003.htm
new file mode 100644
index 00000000000..e942aadd0f6
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vlr-003.htm
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn">ᠨ<span id="larger">ᠨᠨ</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vlr-005.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vlr-005.htm
new file mode 100644
index 00000000000..b14f5e51b5f
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vlr-005.htm
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn">ᠨ<span id="larger" lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vrl-002.htm
new file mode 100644
index 00000000000..6d1498fd6bf
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vrl-002.htm
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja">方<span id="larger">方方</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vrl-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vrl-004.htm
new file mode 100644
index 00000000000..c751d937df9
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-font-size-vrl-004.htm
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja">方<span id="larger" lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-mixed-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-mixed-vlr-003.htm
new file mode 100644
index 00000000000..f4d0e56c110
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-mixed-vlr-003.htm
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn">ᠨ<span lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-mixed-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-mixed-vrl-002.htm
new file mode 100644
index 00000000000..6615b3f5485
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/underline-mixed-vrl-002.htm
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+ <head>
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings">
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property">
+
+  <meta content="" name="flags">
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert">
+
+  <style type="text/css">
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja">方<span lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002.htm
similarity index 85%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-002.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002.htm
index 62e87476b33..d9d003691e4 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002.htm
@@ -3,10 +3,11 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'top' and vertical-rl writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box.">
-    <link rel="match" href="reference/vertical-alignment-new-002-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-002-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#rl
@@ -21,6 +22,7 @@
       font-size: 0.5em;
       color: orange;
       vertical-align: top;
+      margin-top: -1em;
     }
     </style>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002a.htm
deleted file mode 100644
index ee8edd31361..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002b.htm
deleted file mode 100644
index 366578f274a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-002b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003.htm
similarity index 76%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-003.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003.htm
index 6b922828843..23822e716cc 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003.htm
@@ -3,25 +3,26 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'top' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box.">
-    <link rel="match" href="reference/vertical-alignment-new-002-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-002-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#lr
     {
-      border-right: blue solid 2em;
       writing-mode: vertical-lr;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: top;
-      line-height: 1;
+      margin-top: -1em;
     }
     </style>
 
@@ -29,7 +30,7 @@
 
   <body>
 
-  <p>Test passes if the right edge of an orange square touches the left edge of a blue square.</p>
+  <p>Test passes if the right edge of an blue square is aligned with the left edge of a orange square.</p>
 
   <div id="lr">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003a.htm
deleted file mode 100644
index dcd71bd5e80..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003a.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003b.htm
deleted file mode 100644
index 7b0937809f4..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-003b.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-004.htm
similarity index 83%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-004.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-004.htm
index ed51611b23e..77351e90b0d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-004.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-004.htm
@@ -3,16 +3,17 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'text-top' and vertical-rl writing-mode</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-09-01 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area.">
-    <link rel="match" href="reference/vertical-alignment-new-004-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-004-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#rl
     {
       color: orange;
-      font: 3.75em/3 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-rl;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-005.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005.htm
similarity index 76%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-005.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005.htm
index d85a936b0b9..af0221b54cf 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-005.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005.htm
@@ -3,16 +3,17 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'text-top' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area.">
-    <link rel="match" href="reference/vertical-alignment-new-004-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-004-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#lr
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-lr;
     }
 
@@ -20,7 +21,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-top;
-      line-height: 1;
     }
 
     </style>
@@ -29,7 +29,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="lr">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005a.htm
deleted file mode 100644
index c70bb3a065c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005b.htm
deleted file mode 100644
index f9d022925b9..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-005b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-006.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-006.htm
similarity index 77%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-006.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-006.htm
index e72a34bf751..1c0cfa2fe83 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-006.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-006.htm
@@ -3,16 +3,17 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'text-bottom' and vertical-rl writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area.">
-    <link rel="match" href="reference/vertical-alignment-new-006-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-006-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#rl
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-rl;
     }
 
@@ -20,7 +21,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-bottom;
-      line-height: 1;
     }
 
     </style>
@@ -29,7 +29,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="rl">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-007.htm
similarity index 77%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-007.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-007.htm
index 589b7892f90..4273e1018f5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-007.htm
@@ -3,16 +3,17 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'text-bottom' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area.">
-    <link rel="match" href="reference/vertical-alignment-new-006-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-006-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#lr
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-lr;
     }
 
@@ -20,7 +21,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-bottom;
-      line-height: 1;
     }
 
     </style>
@@ -29,7 +29,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="lr">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-008.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008.htm
similarity index 76%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-008.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008.htm
index 53988991125..c008f265e19 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-008.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008.htm
@@ -3,25 +3,26 @@
   <head>
    <title>CSS Writing Modes Test: vertical-align - 'bottom' and vertical-rl writing-mode</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-09-03 -->
    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
    <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
    <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box.">
-    <link rel="match" href="reference/vertical-alignment-new-008-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-008-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#rl
     {
-      border-left: blue solid 2em;
       writing-mode: vertical-rl;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: bottom;
-      line-height: 1;
+      margin-top: -1em;
     }
 
     </style>
@@ -30,7 +31,7 @@
 
   <body>
 
-  <p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+  <p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
   <div id="rl">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008a.htm
deleted file mode 100644
index 9d5f6534663..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008b.htm
deleted file mode 100644
index a10687f9446..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-008b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-009.htm
similarity index 76%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-009.htm
rename to tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-009.htm
index 6e2f12cea7b..e919562b8e9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-new-009.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-009.htm
@@ -3,25 +3,26 @@
   <head>
     <title>CSS Writing Modes Test: vertical-align - 'bottom' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading">
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box.">
-    <link rel="match" href="reference/vertical-alignment-new-008-ref.htm">
+    <link rel="match" href="reference/vertical-alignment-008-ref.htm">
     <meta name="flags" content="ahem">
     <style type="text/css">
     div#lr
     {
-      border-left: blue solid 2em;
       writing-mode: vertical-lr;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: bottom;
-      line-height: 1;
+      margin-top: -1em;
     }
 
     </style>
@@ -30,7 +31,7 @@
 
   <body>
 
-  <p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+  <p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
   <div id="lr">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-011a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-011a.htm
deleted file mode 100644
index ded3193bacd..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-011a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-011b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-011b.htm
deleted file mode 100644
index 430e12f7346..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-011b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-012l.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-012l.htm
deleted file mode 100644
index f3fd97e4049..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-012l.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-012r.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-012r.htm
deleted file mode 100644
index 2841a9b510f..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-012r.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-014a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-014a.htm
deleted file mode 100644
index b89c0cc51b9..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-014a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-014b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-014b.htm
deleted file mode 100644
index 9a640925364..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-014b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-015a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-015a.htm
deleted file mode 100644
index f3afe48fa25..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-015a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-015b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-015b.htm
deleted file mode 100644
index 44f4038e335..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-015b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-017a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-017a.htm
deleted file mode 100644
index 2e117ad9c3c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-017a.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-017b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-017b.htm
deleted file mode 100644
index c5fd68544f8..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-017b.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-018a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-018a.htm
deleted file mode 100644
index 2c146eb21fd..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-018a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-018b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-018b.htm
deleted file mode 100644
index 43a49e6b40d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-018b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-020a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-020a.htm
deleted file mode 100644
index 5761d54e9e5..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-020a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-020b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-020b.htm
deleted file mode 100644
index d68b3988718..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-020b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-021a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-021a.htm
deleted file mode 100644
index fd6720dcb97..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-021a.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-021b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-021b.htm
deleted file mode 100644
index dc6362d8888..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-021b.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-023a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-023a.htm
deleted file mode 100644
index 99653606dbf..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-023a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-023b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-023b.htm
deleted file mode 100644
index e981122d2ed..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-023b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-024a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-024a.htm
deleted file mode 100644
index 4fedb94c5c6..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-024a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-024b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-024b.htm
deleted file mode 100644
index 69e5ae449c0..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-024b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-026a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-026a.htm
deleted file mode 100644
index 76b4ffbca1f..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-026a.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-026b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-026b.htm
deleted file mode 100644
index f897570b395..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-026b.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-027a.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-027a.htm
deleted file mode 100644
index 6c6dedc19c6..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-027a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-027b.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-027b.htm
deleted file mode 100644
index 4f9890bbc90..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/vertical-alignment-027b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
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 dac4ce3554b..9d7c796028b 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
@@ -581,6 +581,8 @@ html/bidi-002.htm	48d2d4ba08ef8b06d14ef353e9fb8caa30bb43af	?
 xhtml1/bidi-002.xht	48d2d4ba08ef8b06d14ef353e9fb8caa30bb43af	?
 html/bidi-003.htm	4fc2169d7f75864298bca1a48c3d4d3bdb3560cf	?
 xhtml1/bidi-003.xht	4fc2169d7f75864298bca1a48c3d4d3bdb3560cf	?
+html/bidi-004.htm	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	?
+xhtml1/bidi-004.xht	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	?
 html/bidi-005.htm	9a94108988b0d806f23f5d63aec2a5b34d6aea05	?
 xhtml1/bidi-005.xht	9a94108988b0d806f23f5d63aec2a5b34d6aea05	?
 html/bidi-006.htm	a699b5134869e68b68c5399f9be53865f6bb90cd	?
@@ -1049,8 +1051,8 @@ html/extract-ordered-list-direction-and-writing-modes.htm	f456a08de75932c3881a76
 xhtml1/extract-ordered-list-direction-and-writing-modes.xht	f456a08de75932c3881a76490ed2fdb7211d2bc8	?
 html/first-page-vlr-003.htm	ba9f62a92fda53555211ee1de1a17cb08e124dd6	?
 xhtml1/first-page-vlr-003.xht	ba9f62a92fda53555211ee1de1a17cb08e124dd6	?
-html/first-page-vrl-002.htm	0e3999276064df4aff359983d7a6cb2977a7a19b	?
-xhtml1/first-page-vrl-002.xht	0e3999276064df4aff359983d7a6cb2977a7a19b	?
+html/first-page-vrl-002.htm	d889dab856e4fad4d820153f78921a043b28589d	?
+xhtml1/first-page-vrl-002.xht	d889dab856e4fad4d820153f78921a043b28589d	?
 html/flexbox-writing-mode-007.htm	0557a81af23da4d969bce70f840968a7d5947006	?
 xhtml1/flexbox-writing-mode-007.xht	0557a81af23da4d969bce70f840968a7d5947006	?
 html/flexbox-writing-mode-008.htm	aaac3dcddfec40e5c67ae479e0df2184ddec82d2	?
@@ -1625,6 +1627,18 @@ html/text-orientation-sideways-right-001.htm	0553269d79d31412d44b0b586a2711298ed
 xhtml1/text-orientation-sideways-right-001.xht	0553269d79d31412d44b0b586a2711298ed43b7f	?
 html/text-orientation-upright-001.htm	c2881506193c25b132f0d88c5ad2a8d1c53e37b6	?
 xhtml1/text-orientation-upright-001.xht	c2881506193c25b132f0d88c5ad2a8d1c53e37b6	?
+html/underline-font-size-vlr-003.htm	05a00f9e67ec770a68184f514da16d42f3664b4e	?
+xhtml1/underline-font-size-vlr-003.xht	05a00f9e67ec770a68184f514da16d42f3664b4e	?
+html/underline-font-size-vlr-005.htm	cf494cde416df9487dabe224857d7c09849b13a7	?
+xhtml1/underline-font-size-vlr-005.xht	cf494cde416df9487dabe224857d7c09849b13a7	?
+html/underline-font-size-vrl-002.htm	fde426aff2dd0f2666881af719f8a933595db5e5	?
+xhtml1/underline-font-size-vrl-002.xht	fde426aff2dd0f2666881af719f8a933595db5e5	?
+html/underline-font-size-vrl-004.htm	b37f8604be0f98e2fb03f2f2198170017232ece1	?
+xhtml1/underline-font-size-vrl-004.xht	b37f8604be0f98e2fb03f2f2198170017232ece1	?
+html/underline-mixed-vlr-003.htm	ffd107c6592a7876badaee2070b4aac10886bbc3	?
+xhtml1/underline-mixed-vlr-003.xht	ffd107c6592a7876badaee2070b4aac10886bbc3	?
+html/underline-mixed-vrl-002.htm	233697bcbc7031e4901fe8df986802a06698c850	?
+xhtml1/underline-mixed-vrl-002.xht	233697bcbc7031e4901fe8df986802a06698c850	?
 html/unicode-bidi-001.htm	23dd56a09e50c8f068ed78bfbec09343f4189224	?
 xhtml1/unicode-bidi-001.xht	23dd56a09e50c8f068ed78bfbec09343f4189224	?
 html/unicode-bidi-002.htm	4b27955dff5183c9c707ec654c50ab0d5c9509f4	?
@@ -1661,86 +1675,22 @@ html/unicode-bidi-applies-to-014.htm	1ea78d913a72bdf534c9701bc8a771df856e3d2f	?
 xhtml1/unicode-bidi-applies-to-014.xht	1ea78d913a72bdf534c9701bc8a771df856e3d2f	?
 html/unicode-bidi-applies-to-015.htm	f319b3e86aea3385f390f78d56ba608a6ac94f27	?
 xhtml1/unicode-bidi-applies-to-015.xht	f319b3e86aea3385f390f78d56ba608a6ac94f27	?
-html/vertical-alignment-002a.htm	a55994c93e6652bdc61229154fe73727bd2c9aea	?
-xhtml1/vertical-alignment-002a.xht	a55994c93e6652bdc61229154fe73727bd2c9aea	?
-html/vertical-alignment-002b.htm	779a3696b7909f11787ad979d92c965675b8ed71	?
-xhtml1/vertical-alignment-002b.xht	779a3696b7909f11787ad979d92c965675b8ed71	?
-html/vertical-alignment-003a.htm	66706a353742efd4400d64575c633bb17a2a7252	?
-xhtml1/vertical-alignment-003a.xht	66706a353742efd4400d64575c633bb17a2a7252	?
-html/vertical-alignment-003b.htm	c28364f9b1f41b8538e624119234b1d35d6c6091	?
-xhtml1/vertical-alignment-003b.xht	c28364f9b1f41b8538e624119234b1d35d6c6091	?
-html/vertical-alignment-005a.htm	2df8dff5be7453c111fb9364ef9d796a91095b3a	?
-xhtml1/vertical-alignment-005a.xht	2df8dff5be7453c111fb9364ef9d796a91095b3a	?
-html/vertical-alignment-005b.htm	2fc7c00892fc1d5860633a96bba4ba7878ad7004	?
-xhtml1/vertical-alignment-005b.xht	2fc7c00892fc1d5860633a96bba4ba7878ad7004	?
-html/vertical-alignment-008a.htm	9dc8848f9db104ed33e3001e946369278588df9c	?
-xhtml1/vertical-alignment-008a.xht	9dc8848f9db104ed33e3001e946369278588df9c	?
-html/vertical-alignment-008b.htm	7de9f0763dbb93b0f55dceb7b80116c87ad800df	?
-xhtml1/vertical-alignment-008b.xht	7de9f0763dbb93b0f55dceb7b80116c87ad800df	?
-html/vertical-alignment-011a.htm	e3c5648ce732c30881a84fb5a0a8083191332a56	?
-xhtml1/vertical-alignment-011a.xht	e3c5648ce732c30881a84fb5a0a8083191332a56	?
-html/vertical-alignment-011b.htm	724bbb86a2b9ec3bd9252fec92cacd6212775175	?
-xhtml1/vertical-alignment-011b.xht	724bbb86a2b9ec3bd9252fec92cacd6212775175	?
-html/vertical-alignment-012l.htm	1684f5ad59fd0c5ce9f9d3190bf569388b3557ba	?
-xhtml1/vertical-alignment-012l.xht	1684f5ad59fd0c5ce9f9d3190bf569388b3557ba	?
-html/vertical-alignment-012r.htm	dcd288dd395eea47285230ca20aa83dd6c874f17	?
-xhtml1/vertical-alignment-012r.xht	dcd288dd395eea47285230ca20aa83dd6c874f17	?
-html/vertical-alignment-014a.htm	199a8e04915d4e564618ef120bf32e5c568cafc0	?
-xhtml1/vertical-alignment-014a.xht	199a8e04915d4e564618ef120bf32e5c568cafc0	?
-html/vertical-alignment-014b.htm	755eb3f5800991c4d7df16dc70d2aaf30e419c42	?
-xhtml1/vertical-alignment-014b.xht	755eb3f5800991c4d7df16dc70d2aaf30e419c42	?
-html/vertical-alignment-015a.htm	32b2362ace97e299f7beaa3aac8d3323837c7fc8	?
-xhtml1/vertical-alignment-015a.xht	32b2362ace97e299f7beaa3aac8d3323837c7fc8	?
-html/vertical-alignment-015b.htm	f059163e577bcbadccf1e2912c2c8724777930c2	?
-xhtml1/vertical-alignment-015b.xht	f059163e577bcbadccf1e2912c2c8724777930c2	?
-html/vertical-alignment-017a.htm	83b231bd5ad62e4e981f504bedbe7bfde444335d	?
-xhtml1/vertical-alignment-017a.xht	83b231bd5ad62e4e981f504bedbe7bfde444335d	?
-html/vertical-alignment-017b.htm	20354412b9971eb45aafda4db62c290f6a2b1602	?
-xhtml1/vertical-alignment-017b.xht	20354412b9971eb45aafda4db62c290f6a2b1602	?
-html/vertical-alignment-018a.htm	7cc30a291d2c69b03bd4179951b87c58e2a02ccb	?
-xhtml1/vertical-alignment-018a.xht	7cc30a291d2c69b03bd4179951b87c58e2a02ccb	?
-html/vertical-alignment-018b.htm	bda9934745cc38f21bcb4235eac2d5824d849f9f	?
-xhtml1/vertical-alignment-018b.xht	bda9934745cc38f21bcb4235eac2d5824d849f9f	?
-html/vertical-alignment-020a.htm	6533d451114b23d657e6bbc8362390a1c4aaf1eb	?
-xhtml1/vertical-alignment-020a.xht	6533d451114b23d657e6bbc8362390a1c4aaf1eb	?
-html/vertical-alignment-020b.htm	7b7ff221754d9c3bc955380e044413ccfbf7ee8b	?
-xhtml1/vertical-alignment-020b.xht	7b7ff221754d9c3bc955380e044413ccfbf7ee8b	?
-html/vertical-alignment-021a.htm	9ddfeee8aeba9e1241ce506ec75af1ba37f6ef06	?
-xhtml1/vertical-alignment-021a.xht	9ddfeee8aeba9e1241ce506ec75af1ba37f6ef06	?
-html/vertical-alignment-021b.htm	0e68e5e6821c0645ff08d40eb02e7ddd87d99caf	?
-xhtml1/vertical-alignment-021b.xht	0e68e5e6821c0645ff08d40eb02e7ddd87d99caf	?
-html/vertical-alignment-023a.htm	d42792f46d6c5d9052eaf7ed1c7981d3968fdc07	?
-xhtml1/vertical-alignment-023a.xht	d42792f46d6c5d9052eaf7ed1c7981d3968fdc07	?
-html/vertical-alignment-023b.htm	a13b1e018382f0e99499b691e9cbbe8f2bcfb740	?
-xhtml1/vertical-alignment-023b.xht	a13b1e018382f0e99499b691e9cbbe8f2bcfb740	?
-html/vertical-alignment-024a.htm	339511c5b7a5eef6400b44a7cb6403adebe16ae0	?
-xhtml1/vertical-alignment-024a.xht	339511c5b7a5eef6400b44a7cb6403adebe16ae0	?
-html/vertical-alignment-024b.htm	d6cc4618d830dfb7a86b471d7b149546f7721bd4	?
-xhtml1/vertical-alignment-024b.xht	d6cc4618d830dfb7a86b471d7b149546f7721bd4	?
-html/vertical-alignment-026a.htm	777a16060504fa5c1a2c649279ee6dbcb56729ad	?
-xhtml1/vertical-alignment-026a.xht	777a16060504fa5c1a2c649279ee6dbcb56729ad	?
-html/vertical-alignment-026b.htm	fb3d8d2c8ec17a80bc05d9cf6027855dab6b9836	?
-xhtml1/vertical-alignment-026b.xht	fb3d8d2c8ec17a80bc05d9cf6027855dab6b9836	?
-html/vertical-alignment-027a.htm	ca2c37b2acc7a2be0e438b5069acd2286487b6ab	?
-xhtml1/vertical-alignment-027a.xht	ca2c37b2acc7a2be0e438b5069acd2286487b6ab	?
-html/vertical-alignment-027b.htm	eb3ef979b26f31507a2f72ba374274fd22113364	?
-xhtml1/vertical-alignment-027b.xht	eb3ef979b26f31507a2f72ba374274fd22113364	?
-html/vertical-alignment-new-002.htm	515da3806b29df524807102d2a3a278cd8ee89b7	?
-xhtml1/vertical-alignment-new-002.xht	515da3806b29df524807102d2a3a278cd8ee89b7	?
-html/vertical-alignment-new-003.htm	d8711ff67efb10fec65c3cd87238a69f94a4b85d	?
-xhtml1/vertical-alignment-new-003.xht	d8711ff67efb10fec65c3cd87238a69f94a4b85d	?
-html/vertical-alignment-new-004.htm	234bc9d84450e317b1b9243cda9b0f9a261b360d	?
-xhtml1/vertical-alignment-new-004.xht	234bc9d84450e317b1b9243cda9b0f9a261b360d	?
-html/vertical-alignment-new-005.htm	eca0b3cf343e86cc7ec5c08969adfd7b603ed51a	?
-xhtml1/vertical-alignment-new-005.xht	eca0b3cf343e86cc7ec5c08969adfd7b603ed51a	?
-html/vertical-alignment-new-006.htm	61e9e28954d65bb677c10c1ecabe02697a4be616	?
-xhtml1/vertical-alignment-new-006.xht	61e9e28954d65bb677c10c1ecabe02697a4be616	?
-html/vertical-alignment-new-007.htm	b8f4194fc311ebd51130715a3947c69f63e3c21b	?
-xhtml1/vertical-alignment-new-007.xht	b8f4194fc311ebd51130715a3947c69f63e3c21b	?
-html/vertical-alignment-new-008.htm	73e2f80c8ee8ddd097b71d7b07b9b886e5895f0f	?
-xhtml1/vertical-alignment-new-008.xht	73e2f80c8ee8ddd097b71d7b07b9b886e5895f0f	?
-html/vertical-alignment-new-009.htm	aa74713244d8619cc17b458de1eba22f22f87c5a	?
-xhtml1/vertical-alignment-new-009.xht	aa74713244d8619cc17b458de1eba22f22f87c5a	?
+html/vertical-alignment-002.htm	4c53752f7cb914db7dbaaa14f288b68bf309a007	?
+xhtml1/vertical-alignment-002.xht	4c53752f7cb914db7dbaaa14f288b68bf309a007	?
+html/vertical-alignment-003.htm	1026d4c787262714d3f0a446435d77f99dd791ff	?
+xhtml1/vertical-alignment-003.xht	1026d4c787262714d3f0a446435d77f99dd791ff	?
+html/vertical-alignment-004.htm	5a5453f032ae0dc73575f7a1b1cda98f702e4cbd	?
+xhtml1/vertical-alignment-004.xht	5a5453f032ae0dc73575f7a1b1cda98f702e4cbd	?
+html/vertical-alignment-005.htm	dd1d34eeed4dc29947946f23c1bb33a52c137a6b	?
+xhtml1/vertical-alignment-005.xht	dd1d34eeed4dc29947946f23c1bb33a52c137a6b	?
+html/vertical-alignment-006.htm	ebaa202f68415b725ed9b57425d6dfc4143e8c84	?
+xhtml1/vertical-alignment-006.xht	ebaa202f68415b725ed9b57425d6dfc4143e8c84	?
+html/vertical-alignment-007.htm	5a6fc29d4ee3bd782a04c4e118b53801e5c8eb3b	?
+xhtml1/vertical-alignment-007.xht	5a6fc29d4ee3bd782a04c4e118b53801e5c8eb3b	?
+html/vertical-alignment-008.htm	fea0050dbf199c607d6a17263f4b49d0303bdc50	?
+xhtml1/vertical-alignment-008.xht	fea0050dbf199c607d6a17263f4b49d0303bdc50	?
+html/vertical-alignment-009.htm	17c24fd05a1e0b837b6e65096f068bebd6108b19	?
+xhtml1/vertical-alignment-009.xht	17c24fd05a1e0b837b6e65096f068bebd6108b19	?
 html/writing-mode-horizontal-001l.htm	820b6baaa9ff63cf1a29b989c8d68ebdafe3c4da	?
 xhtml1/writing-mode-horizontal-001l.xht	820b6baaa9ff63cf1a29b989c8d68ebdafe3c4da	?
 html/writing-mode-horizontal-001r.htm	946a8be6f47e1cdc7ca7539e48e9964bd77c9ba9	?
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 6ef7fc05179..09d0d5c6877 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
@@ -288,6 +288,7 @@ baseline-inline-replaced-003	reference/baseline-inline-replaced-002-ref	baseline
 bidi-001	reference/bidi-001-ref	RLO/PDF bidi reordering across closing inline element boundary		http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/	4b17669682a01af35c7ff859a56ff14979004532	`Ian Hickson`<mailto:ian@hixie.ch>	Tests that RLO + closing inline element boundary + PDF reorders text, splitting inline and rendering borders and padding appropriately.
 bidi-002	reference/bidi-002-ref	RLO/PDF bidi reordering across closing inline element boundary + soft line break		http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	48d2d4ba08ef8b06d14ef353e9fb8caa30bb43af	`Ian Hickson`<mailto:ian@hixie.ch>	Tests that RLO + closing inline element boundary + soft line break + PDF reorders text, placing text correctly on each line while also splitting inline and rendering borders and padding appropriately.
 bidi-003	reference/bidi-003-ref	RLO/PDF bidi reordering across closing inline element boundary + opening inline boundary		http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/	4fc2169d7f75864298bca1a48c3d4d3bdb3560cf	`Ian Hickson`<mailto:ian@hixie.ch>	Tests that RLO + closing inline element boundary + opening inline element boundary + PDF reorders text, splitting inlines and rendering their borders and padding appropriately.
+bidi-004	reference/bidi-004-ref	The bidi algorithm and inlines in CSS	ahem,may21	http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-text-3/#white-space-rules,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/,http://www.w3.org/TR/html5/rendering.html#phrasing-content-0	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-005		The bidi algorithm and inlines in CSS: embed levels and white-space: pre;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	9a94108988b0d806f23f5d63aec2a5b34d6aea05	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-006		The bidi algorithm and inlines in CSS: embed levels and white-space: nowrap;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	a699b5134869e68b68c5399f9be53865f6bb90cd	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-007		The bidi algorithm and inlines in CSS: embed levels and float: left;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	52cbe1038400d33a001f042c6b78f1ee216c902b	`Ian Hickson`<mailto:ian@hixie.ch>	
@@ -522,7 +523,7 @@ direction-vrl-002	reference/direction-vrl-002-ref	'vertical-rl' and 'direction:
 direction-vrl-004	reference/direction-vrl-004-ref	'vertical-rl' and 'direction: ltr'	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#logical-directions	31d81702696bd0c7fe90ce7f4b6a91947db9234f	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when a block box has 'direction' set to 'ltr' in a vertical writing-mode, then inlines boxes are aligned from line-left to line-right.
 extract-ordered-list-direction-and-writing-modes	reference/extract-ordered-list-direction-and-writing-modes-ref	flow-into on list items that use different text directions or writing modes		http://www.w3.org/TR/css3-regions/#properties,http://www.w3.org/TR/css3-regions/#the-flow-into-property,http://www.w3.org/TR/css-writing-modes-3/#direction,http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode	f456a08de75932c3881a76490ed2fdb7211d2bc8	`Mihai Balan`<mibalan@adobe.com>	The flow-into property can be applied to elements that have different text directions and writing modes. This tests that the rendering for lists that use different text directions/writing modes are not affected when they are extracted in a named flow and rendered in a region.
 first-page-vlr-003		first page of a document with vertical-lr writing-mode	paged	http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/CSS21/page.html#page-selectors	ba9f62a92fda53555211ee1de1a17cb08e124dd6	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is left-to-right. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-lr' is the :right page.
-first-page-vrl-002		first page of a document with vertical-rl writing-mode	image,paged	http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/CSS21/page.html#page-selectors	0e3999276064df4aff359983d7a6cb2977a7a19b	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page.
+first-page-vrl-002		first page of a document with vertical-rl writing-mode	image,paged	http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/CSS21/page.html#page-selectors	d889dab856e4fad4d820153f78921a043b28589d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page.
 flexbox-writing-mode-007	reference/flexbox-writing-mode-007-ref	Verify that explicit sizes are honored on flex items whose writing-mode may differ from the flex container's writing-mode		http://www.w3.org/TR/css-flexbox-1/#layout-algorithm,http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode	0557a81af23da4d969bce70f840968a7d5947006	`Daniel Holbert`<mailto:dholbert@mozilla.com>	
 flexbox-writing-mode-008	reference/flexbox-writing-mode-008-ref	Verify that explicit sizes are honored on flex items whose writing-mode may differ from the flex container's writing-mode		http://www.w3.org/TR/css-flexbox-1/#layout-algorithm,http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode	aaac3dcddfec40e5c67ae479e0df2184ddec82d2	`Daniel Holbert`<mailto:dholbert@mozilla.com>	
 flexbox-writing-mode-009	reference/flexbox-writing-mode-009-ref	Verify that explicit sizes are honored on flex items whose writing-mode may differ from the flex container's writing-mode		http://www.w3.org/TR/css-flexbox-1/#layout-algorithm,http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode	931b9d02203e63cacec94a45b450d721c5222706	`Daniel Holbert`<mailto:dholbert@mozilla.com>	
@@ -810,6 +811,12 @@ text-orientation-sideways-002		text-orientation - sideways in vertical-lr writin
 text-orientation-sideways-left-001		text-orientation - sideways-left in vertical-rl writing mode	font,image	http://www.w3.org/TR/css-writing-modes-3/#text-orientation	37efc584b582b3fe93de726057ddf69aa6544cf0	`Kazuaki Takemura`<mailto:takemura@networksoft.co.jp>	This test checks that a general horizontal text(include Japanese,etc) rotated 90 degrees counter-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).
+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	05a00f9e67ec770a68184f514da16d42f3664b4e	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+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	cf494cde416df9487dabe224857d7c09849b13a7	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+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	fde426aff2dd0f2666881af719f8a933595db5e5	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+underline-font-size-vrl-004		'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	b37f8604be0f98e2fb03f2f2198170017232ece1	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.
+underline-mixed-vlr-003		'text-decoration: underline' 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	ffd107c6592a7876badaee2070b4aac10886bbc3	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.
+underline-mixed-vrl-002		'text-decoration: underline' 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	233697bcbc7031e4901fe8df986802a06698c850	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.
 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.
@@ -828,46 +835,14 @@ unicode-bidi-applies-to-012	reference/direction-applies-to-008-ref	Unicode-bidi
 unicode-bidi-applies-to-013	reference/direction-applies-to-008-ref	Unicode-bidi applied to element with 'display' set to 'table'		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	5e96cad2593bff9bf262c57806aa45b87820f36b	`Microsoft`<http://www.microsoft.com/>	The 'unicode-bidi' property does not apply to elements with a display of 'table'. 'unicode-bidi' property only applies to inline elements or block containers' immediate inline-level descendants.
 unicode-bidi-applies-to-014	reference/direction-applies-to-008-ref	Unicode-bidi applied to element with 'display' set to 'inline-table'		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	1ea78d913a72bdf534c9701bc8a771df856e3d2f	`Microsoft`<http://www.microsoft.com/>	The 'unicode-bidi' property does not apply to elements with a display of 'inline-table'. 'unicode-bidi' property only applies to inline elements or block containers' immediate inline-level descendants.
 unicode-bidi-applies-to-015	reference/direction-applies-to-008-ref	Unicode-bidi applied to element with 'display' set to 'table-caption'		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	f319b3e86aea3385f390f78d56ba608a6ac94f27	`Microsoft`<http://www.microsoft.com/>	The 'unicode-bidi' property applies to elements with a display of 'table-caption'.
-vertical-alignment-002a		vertical align - 'baseline' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	a55994c93e6652bdc61229154fe73727bd2c9aea	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-002b		vertical align - 'baseline' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	779a3696b7909f11787ad979d92c965675b8ed71	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-003a		vertical align - 'baseline' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	66706a353742efd4400d64575c633bb17a2a7252	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-003b		vertical align - 'baseline' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	c28364f9b1f41b8538e624119234b1d35d6c6091	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-005a		vertical align - 'sub' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	2df8dff5be7453c111fb9364ef9d796a91095b3a	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-005b		vertical align - 'sub' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	2fc7c00892fc1d5860633a96bba4ba7878ad7004	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-008a		vertical align - 'super' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	9dc8848f9db104ed33e3001e946369278588df9c	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-008b		vertical align - 'super' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	7de9f0763dbb93b0f55dceb7b80116c87ad800df	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-011a		vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	e3c5648ce732c30881a84fb5a0a8083191332a56	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-011b		vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	724bbb86a2b9ec3bd9252fec92cacd6212775175	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-012l		vertical align - 'zero length (0em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	1684f5ad59fd0c5ce9f9d3190bf569388b3557ba	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-012r		vertical align - 'zero length (0em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	dcd288dd395eea47285230ca20aa83dd6c874f17	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-014a		vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	199a8e04915d4e564618ef120bf32e5c568cafc0	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-014b		vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	755eb3f5800991c4d7df16dc70d2aaf30e419c42	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-015a		vertical align - 'positive length (0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	32b2362ace97e299f7beaa3aac8d3323837c7fc8	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-015b		vertical align - 'positive length (0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	f059163e577bcbadccf1e2912c2c8724777930c2	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-017a		vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	83b231bd5ad62e4e981f504bedbe7bfde444335d	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-017b		vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	20354412b9971eb45aafda4db62c290f6a2b1602	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-018a		vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	7cc30a291d2c69b03bd4179951b87c58e2a02ccb	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-018b		vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	bda9934745cc38f21bcb4235eac2d5824d849f9f	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-020a		vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	6533d451114b23d657e6bbc8362390a1c4aaf1eb	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-020b		vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	7b7ff221754d9c3bc955380e044413ccfbf7ee8b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-021a		vertical align - 'zero percentage (0%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	9ddfeee8aeba9e1241ce506ec75af1ba37f6ef06	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-021b		vertical align - 'zero percentage (0%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	0e68e5e6821c0645ff08d40eb02e7ddd87d99caf	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-023a		vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	d42792f46d6c5d9052eaf7ed1c7981d3968fdc07	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-023b		vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	a13b1e018382f0e99499b691e9cbbe8f2bcfb740	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-024a		vertical align - 'positive percentage (50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	339511c5b7a5eef6400b44a7cb6403adebe16ae0	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-024b		vertical align - 'positive percentage (50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	d6cc4618d830dfb7a86b471d7b149546f7721bd4	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-026a		vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	777a16060504fa5c1a2c649279ee6dbcb56729ad	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-026b		vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	fb3d8d2c8ec17a80bc05d9cf6027855dab6b9836	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-027a		vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	ca2c37b2acc7a2be0e438b5069acd2286487b6ab	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-027b		vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	eb3ef979b26f31507a2f72ba374274fd22113364	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-new-002	reference/vertical-alignment-new-002-ref	vertical-align - 'top' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	515da3806b29df524807102d2a3a278cd8ee89b7	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box.
-vertical-alignment-new-003	reference/vertical-alignment-new-002-ref	vertical-align - 'top' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	d8711ff67efb10fec65c3cd87238a69f94a4b85d	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box.
-vertical-alignment-new-004	reference/vertical-alignment-new-004-ref	vertical-align - 'text-top' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	234bc9d84450e317b1b9243cda9b0f9a261b360d	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area.
-vertical-alignment-new-005	reference/vertical-alignment-new-004-ref	vertical-align - 'text-top' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	eca0b3cf343e86cc7ec5c08969adfd7b603ed51a	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area.
-vertical-alignment-new-006	reference/vertical-alignment-new-006-ref	vertical-align - 'text-bottom' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	61e9e28954d65bb677c10c1ecabe02697a4be616	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area.
-vertical-alignment-new-007	reference/vertical-alignment-new-006-ref	vertical-align - 'text-bottom' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	b8f4194fc311ebd51130715a3947c69f63e3c21b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area.
-vertical-alignment-new-008	reference/vertical-alignment-new-008-ref	vertical-align - 'bottom' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	73e2f80c8ee8ddd097b71d7b07b9b886e5895f0f	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box.
-vertical-alignment-new-009	reference/vertical-alignment-new-008-ref	vertical-align - 'bottom' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	aa74713244d8619cc17b458de1eba22f22f87c5a	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box.
+vertical-alignment-002	reference/vertical-alignment-002-ref	vertical-align - 'top' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	4c53752f7cb914db7dbaaa14f288b68bf309a007	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box.
+vertical-alignment-003	reference/vertical-alignment-002-ref	vertical-align - 'top' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	1026d4c787262714d3f0a446435d77f99dd791ff	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box.
+vertical-alignment-004	reference/vertical-alignment-004-ref	vertical-align - 'text-top' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	5a5453f032ae0dc73575f7a1b1cda98f702e4cbd	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area.
+vertical-alignment-005	reference/vertical-alignment-004-ref	vertical-align - 'text-top' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	dd1d34eeed4dc29947946f23c1bb33a52c137a6b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area.
+vertical-alignment-006	reference/vertical-alignment-006-ref	vertical-align - 'text-bottom' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	ebaa202f68415b725ed9b57425d6dfc4143e8c84	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area.
+vertical-alignment-007	reference/vertical-alignment-006-ref	vertical-align - 'text-bottom' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	5a6fc29d4ee3bd782a04c4e118b53801e5c8eb3b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area.
+vertical-alignment-008	reference/vertical-alignment-008-ref	vertical-align - 'bottom' and vertical-rl writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	fea0050dbf199c607d6a17263f4b49d0303bdc50	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box.
+vertical-alignment-009	reference/vertical-alignment-008-ref	vertical-align - 'bottom' and vertical-lr writing-mode	ahem	http://www.w3.org/TR/css-writing-modes-3/#line-mappings,http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading	17c24fd05a1e0b837b6e65096f068bebd6108b19	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box.
 writing-mode-horizontal-001l	reference/writing-mode-horizontal-001l-ref	CSS Writing Modes: text-combine-upright in horizontal writing mode		http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright	820b6baaa9ff63cf1a29b989c8d68ebdafe3c4da	`Masataka Yakura`<http://google.com/+MasatakaYakura>	text-combine-upright does not have an effect in horizontal writing modes.
 writing-mode-horizontal-001r	reference/writing-mode-horizontal-001r-ref	CSS Writing Modes: text-combine-upright in horizontal writing mode		http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright	946a8be6f47e1cdc7ca7539e48e9964bd77c9ba9	`Masataka Yakura`<http://google.com/+MasatakaYakura>	text-combine-upright does not have an effect in horizontal writing modes.
 writing-mode-stretch-001	reference/writing-mode-stretch-001-ref	writing-mode vertical-lr and vertical-rl		http://www.w3.org/TR/css-writing-modes-3/#writing-mode	b39073243c9598d184c1f6efc298247a42f34aea	`Mitsuteru Sawa`<mailto:mitsuteru.s@gmail.com>	vertical-writing-mode flex items should stretch
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/bidi-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/bidi-004.xht
new file mode 100644
index 00000000000..131ff792d03
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/bidi-004.xht
@@ -0,0 +1,44 @@
+<!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" lang="en" xml:lang="en">
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules" />
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="http://unicode.org/reports/tr9/" />
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0" /> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.xht" />
+
+  <meta name="flags" content="may21 ahem" />
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp ‮ ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX ‬ XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
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 b020bd68da9..5b74807cd71 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 (162 tests)</h2>
+  <h2>Inline Direction and Bidirectionality (163 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -1613,7 +1613,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.4">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model">2.4 Box model for inline boxes in bidirectional context</a></th></tr>
-      <!-- 25 tests -->
+      <!-- 26 tests -->
       <tr id="bidi-001-2.4" class="primary">
         <td><strong>
             <a href="bidi-001.xht">bidi-001</a></strong></td>
@@ -1647,6 +1647,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-2.4" class="primary ahem may21">
+        <td><strong>
+            <a href="bidi-004.xht">bidi-004</a></strong></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-2.4" class="">
         <td>
             <a href="bidi-005.xht">bidi-005</a></td>
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 3c30c5fc7cb..e7ba68f50cc 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 (70 tests)</h2>
+  <h2>Inline-level Alignment (38 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -485,359 +485,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.4">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">4.4 Baseline Alignment</a></th></tr>
-      <!-- 32 tests -->
-      <tr id="vertical-alignment-002a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-002a.xht">vertical-alignment-002a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-002b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-002b.xht">vertical-alignment-002b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-003a.xht">vertical-alignment-003a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-003b.xht">vertical-alignment-003b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-005a.xht">vertical-alignment-005a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-005b.xht">vertical-alignment-005b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-008a.xht">vertical-alignment-008a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-008b.xht">vertical-alignment-008b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-011a.xht">vertical-alignment-011a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-011b.xht">vertical-alignment-011b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012l-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-012l.xht">vertical-alignment-012l</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012r-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-012r.xht">vertical-alignment-012r</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-014a.xht">vertical-alignment-014a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-014b.xht">vertical-alignment-014b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-015a.xht">vertical-alignment-015a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-015b.xht">vertical-alignment-015b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-017a.xht">vertical-alignment-017a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-017b.xht">vertical-alignment-017b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-018a.xht">vertical-alignment-018a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-018b.xht">vertical-alignment-018b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-020a.xht">vertical-alignment-020a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-020b.xht">vertical-alignment-020b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-021a.xht">vertical-alignment-021a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-021b.xht">vertical-alignment-021b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-023a.xht">vertical-alignment-023a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-023b.xht">vertical-alignment-023b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-024a.xht">vertical-alignment-024a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-024b.xht">vertical-alignment-024b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-026a.xht">vertical-alignment-026a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-026b.xht">vertical-alignment-026b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-027a.xht">vertical-alignment-027a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-027b.xht">vertical-alignment-027b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
+      <!-- 0 tests -->
     </tbody>
     <tbody id="s4.4.#dominant-baseline">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-7.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-7.xht
index b8e44bfbcd4..b37f9309ad0 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-7.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-7.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Abstract Box Layout (489 tests)</h2>
+  <h2>Abstract Box Layout (495 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -4637,7 +4637,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.5">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">7.5 Line-Relative Mappings</a></th></tr>
-      <!-- 26 tests -->
+      <!-- 32 tests -->
       <tr id="text-decoration-sidewaysleft-vlr-003-7.5" class="primary">
         <td><strong>
             <a href="text-decoration-sidewaysleft-vlr-003.xht">text-decoration-sidewaysleft-vlr-003</a></strong></td>
@@ -4836,10 +4836,76 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-002-7.5" class="primary ahem">
+      <tr id="underline-font-size-vlr-003-7.5" class="primary">
         <td><strong>
-            <a href="vertical-alignment-new-002.xht">vertical-alignment-new-002</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+            <a href="underline-font-size-vlr-003.xht">underline-font-size-vlr-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vlr-005-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vlr-005.xht">underline-font-size-vlr-005</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-002-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vrl-002.xht">underline-font-size-vrl-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-004-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vrl-004.xht">underline-font-size-vrl-004</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vlr-003-7.5" class="primary">
+        <td><strong>
+            <a href="underline-mixed-vlr-003.xht">underline-mixed-vlr-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vrl-002-7.5" class="primary">
+        <td><strong>
+            <a href="underline-mixed-vrl-002.xht">underline-mixed-vrl-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="vertical-alignment-002-7.5" class="primary ahem">
+        <td><strong>
+            <a href="vertical-alignment-002.xht">vertical-alignment-002</a></strong></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'top' and vertical-rl writing-mode
           <ul class="assert">
@@ -4847,10 +4913,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-003-7.5" class="primary ahem">
+      <tr id="vertical-alignment-003-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-003.xht">vertical-alignment-new-003</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+            <a href="vertical-alignment-003.xht">vertical-alignment-003</a></strong></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'top' and vertical-lr writing-mode
           <ul class="assert">
@@ -4858,10 +4924,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-004-7.5" class="primary ahem">
+      <tr id="vertical-alignment-004-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-004.xht">vertical-alignment-new-004</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+            <a href="vertical-alignment-004.xht">vertical-alignment-004</a></strong></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-top' and vertical-rl writing-mode
           <ul class="assert">
@@ -4869,10 +4935,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-005-7.5" class="primary ahem">
+      <tr id="vertical-alignment-005-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-005.xht">vertical-alignment-new-005</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+            <a href="vertical-alignment-005.xht">vertical-alignment-005</a></strong></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-top' and vertical-lr writing-mode
           <ul class="assert">
@@ -4880,10 +4946,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-006-7.5" class="primary ahem">
+      <tr id="vertical-alignment-006-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-006.xht">vertical-alignment-new-006</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+            <a href="vertical-alignment-006.xht">vertical-alignment-006</a></strong></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-bottom' and vertical-rl writing-mode
           <ul class="assert">
@@ -4891,10 +4957,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-007-7.5" class="primary ahem">
+      <tr id="vertical-alignment-007-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-007.xht">vertical-alignment-new-007</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+            <a href="vertical-alignment-007.xht">vertical-alignment-007</a></strong></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-bottom' and vertical-lr writing-mode
           <ul class="assert">
@@ -4902,10 +4968,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-008-7.5" class="primary ahem">
+      <tr id="vertical-alignment-008-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-008.xht">vertical-alignment-new-008</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+            <a href="vertical-alignment-008.xht">vertical-alignment-008</a></strong></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'bottom' and vertical-rl writing-mode
           <ul class="assert">
@@ -4913,10 +4979,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-009-7.5" class="primary ahem">
+      <tr id="vertical-alignment-009-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-009.xht">vertical-alignment-new-009</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+            <a href="vertical-alignment-009.xht">vertical-alignment-009</a></strong></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'bottom' and vertical-lr writing-mode
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/first-page-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/first-page-vrl-002.xht
index 1c4a848e738..4a4fb3ac320 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/first-page-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/first-page-vrl-002.xht
@@ -1,16 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!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>
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
   <title>CSS Writing Modes Test: first page of a document with vertical-rl writing-mode</title>
 
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property"/>
-  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages"/>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages" />
 
-  <meta content="image paged" name="flags"/>
-  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert"/>
+  <meta content="image paged" name="flags" />
+  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert" />
 
   <style type="text/css" media="print"><![CDATA[
   html
@@ -40,7 +40,7 @@
 
  <body>
 
-  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled"/></p>
+  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled" /></p>
 
   <!--
   The image says:
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/bidi-004-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/bidi-004-ref.xht
new file mode 100644
index 00000000000..9a68a9c2911
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/bidi-004-ref.xht
@@ -0,0 +1,33 @@
+<!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="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <meta name="flags" content="ahem" />
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht
similarity index 81%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht
index 4ddfebc4894..2824e41594c 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht
@@ -3,6 +3,7 @@
 <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-09-03 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
     img
@@ -17,7 +18,7 @@
 
     img#orange
     {
-      padding-left: 120px; /* = the position of orange square */
+      margin-top: 30px;
     }
 
   ]]></style>
@@ -29,7 +30,7 @@
 <p>Test passes if the right edge of an blue square is aligned with the left edge of a orange square.</p>
 
 <div>
-   <img id="blue" src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled" /><br /><!--
+   <img id="blue" src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled" /><!--
 --><img id="orange" src="support/swatch-orange.png" width="30" height="30" alt="Image download support must be enabled" />
 </div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht
similarity index 82%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht
index 19b2b1af888..313bcfdfdb0 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht
@@ -3,6 +3,7 @@
 <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-09-01 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
     img
@@ -12,13 +13,9 @@
 
     img
     {
-      padding-left: 60px; /* = the position of first orange square */
+      padding-left: 60px; /* =  position of orange squares */
     }
 
-    img + br + img
-    {
-      padding-left: 60px; /* = the position of second orange square*/
-    }
   ]]></style>
 
 </head>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht
similarity index 69%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht
index 29e6b7e66f4..41845896508 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht
@@ -3,6 +3,7 @@
 <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-09-03 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
     img
@@ -12,12 +13,12 @@
 
     img
     {
-      padding-left: 15px; /* = the position of first orange square */
+      padding-left: 60px; /* = the position of first orange square */
     }
 
     img + br + img
     {
-      padding-left: 15px; /* = the position of second orange square*/
+      padding-left: 90px; /* = the position of second orange square*/
     }
   ]]></style>
 
@@ -25,7 +26,7 @@
 
 <body>
 
-<p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+<p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
 <div>
    <img src="support/swatch-orange.png" width="60" height="60" alt="Image download support must be enabled" /><br /><!--
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht
similarity index 51%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht
index 6ddfd15d73c..80b20e6a11f 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht
@@ -3,16 +3,12 @@
 <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-09-03 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
-    img
-    {
-      vertical-align: top;
-    }
-
     img#orange
     {
-      padding-top: 60px; /* = the height of first character */
+      padding-left: 30px;
     }
   ]]></style>
 
@@ -20,11 +16,11 @@
 
 <body>
 
-<p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+<p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
 <div>
-   <img src="support/swatch-blue.png" width="120" height="120" alt="Image download support must be enabled" /><!--
---><img id="orange" src="support/swatch-orange.png" width="60" height="60" alt="Image download support must be enabled" />
+  <img id="orange" src="support/swatch-orange.png" width="30" height="30" alt="Image download support must be enabled" /><!--
+--><img src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled" />
 </div>
 
 </body>
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 ae8b6525a3e..9a3cc59f0bb 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
@@ -2208,6 +2208,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="bidi-011" class="">
       <tr>
         <td rowspan="1" title="The bidi algorithm and inlines in CSS wrapping bidi formatting characters">
@@ -5752,67 +5760,67 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-002" class="ahem">
+    <tbody id="vertical-alignment-002" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'top' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-002.xht">vertical-alignment-new-002</a></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+          <a href="vertical-alignment-002.xht">vertical-alignment-002</a></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-003" class="ahem">
+    <tbody id="vertical-alignment-003" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'top' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-003.xht">vertical-alignment-new-003</a></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+          <a href="vertical-alignment-003.xht">vertical-alignment-003</a></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-004" class="ahem">
+    <tbody id="vertical-alignment-004" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-top' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-004.xht">vertical-alignment-new-004</a></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+          <a href="vertical-alignment-004.xht">vertical-alignment-004</a></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-005" class="ahem">
+    <tbody id="vertical-alignment-005" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-top' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-005.xht">vertical-alignment-new-005</a></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+          <a href="vertical-alignment-005.xht">vertical-alignment-005</a></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-006" class="ahem">
+    <tbody id="vertical-alignment-006" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-bottom' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-006.xht">vertical-alignment-new-006</a></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+          <a href="vertical-alignment-006.xht">vertical-alignment-006</a></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-007" class="ahem">
+    <tbody id="vertical-alignment-007" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-bottom' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-007.xht">vertical-alignment-new-007</a></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+          <a href="vertical-alignment-007.xht">vertical-alignment-007</a></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-008" class="ahem">
+    <tbody id="vertical-alignment-008" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'bottom' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-008.xht">vertical-alignment-new-008</a></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+          <a href="vertical-alignment-008.xht">vertical-alignment-008</a></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-009" class="ahem">
+    <tbody id="vertical-alignment-009" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'bottom' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-009.xht">vertical-alignment-new-009</a></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+          <a href="vertical-alignment-009.xht">vertical-alignment-009</a></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
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 2a87383aaf9..5ffb00048c3 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
@@ -272,6 +272,7 @@ baseline-inline-replaced-003.xht == reference/baseline-inline-replaced-002-ref.x
 bidi-001.xht == reference/bidi-001-ref.xht
 bidi-002.xht == reference/bidi-002-ref.xht
 bidi-003.xht == reference/bidi-003-ref.xht
+bidi-004.xht == reference/bidi-004-ref.xht
 bidi-011.xht == reference/bidi-011-ref.xht
 bidi-box-model-001.xht == reference/bidi-box-model-001-ref.xht
 bidi-box-model-002.xht == reference/bidi-box-model-001-ref.xht
@@ -715,14 +716,14 @@ unicode-bidi-applies-to-012.xht == reference/direction-applies-to-008-ref.xht
 unicode-bidi-applies-to-013.xht == reference/direction-applies-to-008-ref.xht
 unicode-bidi-applies-to-014.xht == reference/direction-applies-to-008-ref.xht
 unicode-bidi-applies-to-015.xht == reference/direction-applies-to-008-ref.xht
-vertical-alignment-new-002.xht == reference/vertical-alignment-new-002-ref.xht
-vertical-alignment-new-003.xht == reference/vertical-alignment-new-002-ref.xht
-vertical-alignment-new-004.xht == reference/vertical-alignment-new-004-ref.xht
-vertical-alignment-new-005.xht == reference/vertical-alignment-new-004-ref.xht
-vertical-alignment-new-006.xht == reference/vertical-alignment-new-006-ref.xht
-vertical-alignment-new-007.xht == reference/vertical-alignment-new-006-ref.xht
-vertical-alignment-new-008.xht == reference/vertical-alignment-new-008-ref.xht
-vertical-alignment-new-009.xht == reference/vertical-alignment-new-008-ref.xht
+vertical-alignment-002.xht == reference/vertical-alignment-002-ref.xht
+vertical-alignment-003.xht == reference/vertical-alignment-002-ref.xht
+vertical-alignment-004.xht == reference/vertical-alignment-004-ref.xht
+vertical-alignment-005.xht == reference/vertical-alignment-004-ref.xht
+vertical-alignment-006.xht == reference/vertical-alignment-006-ref.xht
+vertical-alignment-007.xht == reference/vertical-alignment-006-ref.xht
+vertical-alignment-008.xht == reference/vertical-alignment-008-ref.xht
+vertical-alignment-009.xht == reference/vertical-alignment-008-ref.xht
 writing-mode-horizontal-001l.xht == reference/writing-mode-horizontal-001l-ref.xht
 writing-mode-horizontal-001r.xht == reference/writing-mode-horizontal-001r-ref.xht
 writing-mode-stretch-001.xht == reference/writing-mode-stretch-001-ref.xht
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 55fe227049b..c3749e5731e 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,7 +27,7 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.xht">Chapter 2 - 
         Inline Direction and Bidirectionality</a></th>
-      <td>(162 Tests)</td></tr>
+      <td>(163 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         Inline-level Alignment</a></th>
-      <td>(70 Tests)</td></tr>
+      <td>(38 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
@@ -52,7 +52,7 @@
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
         Abstract Box Layout</a></th>
-      <td>(489 Tests)</td></tr>
+      <td>(495 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vlr-003.xht
new file mode 100644
index 00000000000..07f7f85df49
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vlr-003.xht
@@ -0,0 +1,49 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger">ᠨᠨ</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vlr-005.xht
new file mode 100644
index 00000000000..5955b906811
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vlr-005.xht
@@ -0,0 +1,48 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger" lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vrl-002.xht
new file mode 100644
index 00000000000..653f2ce4c26
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vrl-002.xht
@@ -0,0 +1,49 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger">方方</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vrl-004.xht
new file mode 100644
index 00000000000..cd2b6bd765b
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-font-size-vrl-004.xht
@@ -0,0 +1,48 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger" lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-mixed-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-mixed-vlr-003.xht
new file mode 100644
index 00000000000..edc5b9fc1dd
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-mixed-vlr-003.xht
@@ -0,0 +1,43 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-mixed-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-mixed-vrl-002.xht
new file mode 100644
index 00000000000..9eef283dd9f
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/underline-mixed-vrl-002.xht
@@ -0,0 +1,43 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht
similarity index 86%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht
index 9001808fd6c..703c76e71e0 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht
@@ -3,10 +3,11 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'top' and vertical-rl writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-002-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-002-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
@@ -21,6 +22,7 @@
       font-size: 0.5em;
       color: orange;
       vertical-align: top;
+      margin-top: -1em;
     }
     ]]></style>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002a.xht
deleted file mode 100644
index 24def26b4e6..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002b.xht
deleted file mode 100644
index 347a0e57e3c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-002b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht
index 22feeb582ae..700758ddd40 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht
@@ -3,25 +3,26 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'top' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-002-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-002-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
-      border-right: blue solid 2em;
       writing-mode: vertical-lr;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: top;
-      line-height: 1;
+      margin-top: -1em;
     }
     ]]></style>
 
@@ -29,7 +30,7 @@
 
   <body>
 
-  <p>Test passes if the right edge of an orange square touches the left edge of a blue square.</p>
+  <p>Test passes if the right edge of an blue square is aligned with the left edge of a orange square.</p>
 
   <div id="lr">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003a.xht
deleted file mode 100644
index c762505e832..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003a.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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003b.xht
deleted file mode 100644
index 4e0b09a1606..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-003b.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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht
similarity index 85%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht
index ef8b4ff3ff1..8e8173e6d60 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht
@@ -3,16 +3,17 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'text-top' and vertical-rl writing-mode</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-09-01 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-004-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-004-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
     {
       color: orange;
-      font: 3.75em/3 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-rl;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht
index 3e9496c4fd0..320f1fbbdda 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht
@@ -3,16 +3,17 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'text-top' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-004-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-004-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-lr;
     }
 
@@ -20,7 +21,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-top;
-      line-height: 1;
     }
 
     ]]></style>
@@ -29,7 +29,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="lr">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005a.xht
deleted file mode 100644
index cdc837130eb..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005b.xht
deleted file mode 100644
index 1465a3efa27..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-005b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht
index e65324832e1..7d6273cf3c6 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht
@@ -3,16 +3,17 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'text-bottom' and vertical-rl writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-006-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-006-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-rl;
     }
 
@@ -20,7 +21,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-bottom;
-      line-height: 1;
     }
 
     ]]></style>
@@ -29,7 +29,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="rl">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht
index 4e3620cafda..f75ebae46b0 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht
@@ -3,16 +3,17 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'text-bottom' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-006-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-006-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-lr;
     }
 
@@ -20,7 +21,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-bottom;
-      line-height: 1;
     }
 
     ]]></style>
@@ -29,7 +29,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="lr">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht
index 9e5fdc232bc..2ceb93c84e6 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht
@@ -3,25 +3,26 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: vertical-align - 'bottom' and vertical-rl writing-mode</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-09-03 -->
    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
    <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
    <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-008-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-008-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
     {
-      border-left: blue solid 2em;
       writing-mode: vertical-rl;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: bottom;
-      line-height: 1;
+      margin-top: -1em;
     }
 
     ]]></style>
@@ -30,7 +31,7 @@
 
   <body>
 
-  <p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+  <p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
   <div id="rl">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008a.xht
deleted file mode 100644
index 347b0d77fdb..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008b.xht
deleted file mode 100644
index 274a4370161..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-008b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht
index 2dc3b008637..59acc99b853 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht
@@ -3,25 +3,26 @@
   <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>CSS Writing Modes Test: vertical-align - 'bottom' and vertical-lr writing-mode</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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-008-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-008-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
-      border-left: blue solid 2em;
       writing-mode: vertical-lr;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: bottom;
-      line-height: 1;
+      margin-top: -1em;
     }
 
     ]]></style>
@@ -30,7 +31,7 @@
 
   <body>
 
-  <p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+  <p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
   <div id="lr">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-011a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-011a.xht
deleted file mode 100644
index 3d8fe462502..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-011a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-011b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-011b.xht
deleted file mode 100644
index 4ac7e74083a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-011b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-012l.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-012l.xht
deleted file mode 100644
index 742df4cb701..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-012l.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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-012r.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-012r.xht
deleted file mode 100644
index 92df052439a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-012r.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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-014a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-014a.xht
deleted file mode 100644
index 38521e02b5d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-014a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-014b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-014b.xht
deleted file mode 100644
index e030074b75d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-014b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-015a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-015a.xht
deleted file mode 100644
index d4edf12be1f..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-015a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-015b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-015b.xht
deleted file mode 100644
index 63fcd72f9bf..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-015b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-017a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-017a.xht
deleted file mode 100644
index 6179f07ab06..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-017a.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-017b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-017b.xht
deleted file mode 100644
index 38fbff0b7ba..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-017b.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-018a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-018a.xht
deleted file mode 100644
index 3402f3a6e2c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-018a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-018b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-018b.xht
deleted file mode 100644
index c2b0721c546..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-018b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-020a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-020a.xht
deleted file mode 100644
index 2fee81e5651..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-020a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-020b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-020b.xht
deleted file mode 100644
index f2a9fdd1fcd..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-020b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-021a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-021a.xht
deleted file mode 100644
index 06cc31cafd9..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-021a.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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-021b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-021b.xht
deleted file mode 100644
index 164878cbb1e..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-021b.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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-023a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-023a.xht
deleted file mode 100644
index a6d090b2217..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-023a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-023b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-023b.xht
deleted file mode 100644
index 27b6de4d61d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-023b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-024a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-024a.xht
deleted file mode 100644
index 8349488967d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-024a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-024b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-024b.xht
deleted file mode 100644
index 775a8db8c7d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-024b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-026a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-026a.xht
deleted file mode 100644
index 81aff9b7eb4..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-026a.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-026b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-026b.xht
deleted file mode 100644
index 0290befe85a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-026b.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-027a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-027a.xht
deleted file mode 100644
index 14beed6e4e2..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-027a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-027b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-027b.xht
deleted file mode 100644
index 15732ad18e7..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/vertical-alignment-027b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/bidi-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/bidi-004.xht
new file mode 100644
index 00000000000..ffaf3fd2ced
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/bidi-004.xht
@@ -0,0 +1,53 @@
+<!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" lang="en" xml:lang="en">
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>CSS Test: The bidi algorithm and inlines in CSS</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 bidi-004"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules" />
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="http://unicode.org/reports/tr9/" />
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0" /> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.xht" />
+
+  <meta name="flags" content="may21 ahem" />
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp ‮ ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX ‬ XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
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 b020bd68da9..5b74807cd71 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 (162 tests)</h2>
+  <h2>Inline Direction and Bidirectionality (163 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -1613,7 +1613,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s2.4">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model">2.4 Box model for inline boxes in bidirectional context</a></th></tr>
-      <!-- 25 tests -->
+      <!-- 26 tests -->
       <tr id="bidi-001-2.4" class="primary">
         <td><strong>
             <a href="bidi-001.xht">bidi-001</a></strong></td>
@@ -1647,6 +1647,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-2.4" class="primary ahem may21">
+        <td><strong>
+            <a href="bidi-004.xht">bidi-004</a></strong></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-2.4" class="">
         <td>
             <a href="bidi-005.xht">bidi-005</a></td>
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 3c30c5fc7cb..e7ba68f50cc 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 (70 tests)</h2>
+  <h2>Inline-level Alignment (38 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -485,359 +485,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.4">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">4.4 Baseline Alignment</a></th></tr>
-      <!-- 32 tests -->
-      <tr id="vertical-alignment-002a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-002a.xht">vertical-alignment-002a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-002b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-002b.xht">vertical-alignment-002b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-003a.xht">vertical-alignment-003a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-003b.xht">vertical-alignment-003b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-005a.xht">vertical-alignment-005a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-005b.xht">vertical-alignment-005b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-008a.xht">vertical-alignment-008a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-008b.xht">vertical-alignment-008b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-011a.xht">vertical-alignment-011a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-011b.xht">vertical-alignment-011b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012l-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-012l.xht">vertical-alignment-012l</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012r-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-012r.xht">vertical-alignment-012r</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-014a.xht">vertical-alignment-014a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-014b.xht">vertical-alignment-014b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-015a.xht">vertical-alignment-015a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-015b.xht">vertical-alignment-015b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-017a.xht">vertical-alignment-017a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-017b.xht">vertical-alignment-017b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-018a.xht">vertical-alignment-018a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-018b.xht">vertical-alignment-018b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020a-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-020a.xht">vertical-alignment-020a</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020b-4.4" class="primary image">
-        <td><strong>
-            <a href="vertical-alignment-020b.xht">vertical-alignment-020b</a></strong></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-021a.xht">vertical-alignment-021a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-021b.xht">vertical-alignment-021b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-023a.xht">vertical-alignment-023a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-023b.xht">vertical-alignment-023b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-024a.xht">vertical-alignment-024a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-024b.xht">vertical-alignment-024b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-026a.xht">vertical-alignment-026a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-026b.xht">vertical-alignment-026b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027a-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-027a.xht">vertical-alignment-027a</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027b-4.4" class="primary ahem image">
-        <td><strong>
-            <a href="vertical-alignment-027b.xht">vertical-alignment-027b</a></strong></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
+      <!-- 0 tests -->
     </tbody>
     <tbody id="s4.4.#dominant-baseline">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-7.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-7.xht
index b8e44bfbcd4..b37f9309ad0 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-7.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/chapter-7.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
-  <h2>Abstract Box Layout (489 tests)</h2>
+  <h2>Abstract Box Layout (495 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -4637,7 +4637,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.5">+</a>
         <a href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings">7.5 Line-Relative Mappings</a></th></tr>
-      <!-- 26 tests -->
+      <!-- 32 tests -->
       <tr id="text-decoration-sidewaysleft-vlr-003-7.5" class="primary">
         <td><strong>
             <a href="text-decoration-sidewaysleft-vlr-003.xht">text-decoration-sidewaysleft-vlr-003</a></strong></td>
@@ -4836,10 +4836,76 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-002-7.5" class="primary ahem">
+      <tr id="underline-font-size-vlr-003-7.5" class="primary">
         <td><strong>
-            <a href="vertical-alignment-new-002.xht">vertical-alignment-new-002</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+            <a href="underline-font-size-vlr-003.xht">underline-font-size-vlr-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vlr-005-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vlr-005.xht">underline-font-size-vlr-005</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-002-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vrl-002.xht">underline-font-size-vrl-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-font-size-vrl-004-7.5" class="primary">
+        <td><strong>
+            <a href="underline-font-size-vrl-004.xht">underline-font-size-vrl-004</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' with various font sizes and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vlr-003-7.5" class="primary">
+        <td><strong>
+            <a href="underline-mixed-vlr-003.xht">underline-mixed-vlr-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="underline-mixed-vrl-002-7.5" class="primary">
+        <td><strong>
+            <a href="underline-mixed-vrl-002.xht">underline-mixed-vrl-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>'text-decoration: underline' and mixed text
+          <ul class="assert">
+            <li>This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="vertical-alignment-002-7.5" class="primary ahem">
+        <td><strong>
+            <a href="vertical-alignment-002.xht">vertical-alignment-002</a></strong></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'top' and vertical-rl writing-mode
           <ul class="assert">
@@ -4847,10 +4913,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-003-7.5" class="primary ahem">
+      <tr id="vertical-alignment-003-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-003.xht">vertical-alignment-new-003</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+            <a href="vertical-alignment-003.xht">vertical-alignment-003</a></strong></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'top' and vertical-lr writing-mode
           <ul class="assert">
@@ -4858,10 +4924,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-004-7.5" class="primary ahem">
+      <tr id="vertical-alignment-004-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-004.xht">vertical-alignment-new-004</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+            <a href="vertical-alignment-004.xht">vertical-alignment-004</a></strong></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-top' and vertical-rl writing-mode
           <ul class="assert">
@@ -4869,10 +4935,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-005-7.5" class="primary ahem">
+      <tr id="vertical-alignment-005-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-005.xht">vertical-alignment-new-005</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+            <a href="vertical-alignment-005.xht">vertical-alignment-005</a></strong></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-top' and vertical-lr writing-mode
           <ul class="assert">
@@ -4880,10 +4946,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-006-7.5" class="primary ahem">
+      <tr id="vertical-alignment-006-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-006.xht">vertical-alignment-new-006</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+            <a href="vertical-alignment-006.xht">vertical-alignment-006</a></strong></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-bottom' and vertical-rl writing-mode
           <ul class="assert">
@@ -4891,10 +4957,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-007-7.5" class="primary ahem">
+      <tr id="vertical-alignment-007-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-007.xht">vertical-alignment-new-007</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+            <a href="vertical-alignment-007.xht">vertical-alignment-007</a></strong></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'text-bottom' and vertical-lr writing-mode
           <ul class="assert">
@@ -4902,10 +4968,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-008-7.5" class="primary ahem">
+      <tr id="vertical-alignment-008-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-008.xht">vertical-alignment-new-008</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+            <a href="vertical-alignment-008.xht">vertical-alignment-008</a></strong></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'bottom' and vertical-rl writing-mode
           <ul class="assert">
@@ -4913,10 +4979,10 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-new-009-7.5" class="primary ahem">
+      <tr id="vertical-alignment-009-7.5" class="primary ahem">
         <td><strong>
-            <a href="vertical-alignment-new-009.xht">vertical-alignment-new-009</a></strong></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+            <a href="vertical-alignment-009.xht">vertical-alignment-009</a></strong></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>vertical-align - 'bottom' and vertical-lr writing-mode
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/first-page-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/first-page-vrl-002.xht
index 4ec3b957c15..ecd4fa3fd86 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/first-page-vrl-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/first-page-vrl-002.xht
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!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>
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
   <title>CSS Writing Modes Test: first page of a document with vertical-rl writing-mode</title>
   <style type="text/css">
@@ -14,12 +14,12 @@
           }
 </style>
 
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property"/>
-  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages"/>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages" />
 
-  <meta content="image paged" name="flags"/>
-  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert"/>
+  <meta content="image paged" name="flags" />
+  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert" />
 
   <style type="text/css" media="print"><![CDATA[
   html
@@ -49,7 +49,7 @@
 
  <body>
 
-  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled"/></p>
+  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled" /></p>
 
   <!--
   The image says:
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/bidi-004-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/bidi-004-ref.xht
new file mode 100644
index 00000000000..d793d8aeecd
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/bidi-004-ref.xht
@@ -0,0 +1,42 @@
+<!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 bidi-004-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <meta name="flags" content="ahem" />
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht
similarity index 81%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht
index 60b4c540bfa..8e7609e12be 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht
@@ -7,11 +7,12 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-002-ref"; }
+            @top-right { content: "Test vertical-alignment-002-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-09-03 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
     img
@@ -26,7 +27,7 @@
 
     img#orange
     {
-      padding-left: 120px; /* = the position of orange square */
+      margin-top: 30px;
     }
 
   ]]></style>
@@ -38,7 +39,7 @@
 <p>Test passes if the right edge of an blue square is aligned with the left edge of a orange square.</p>
 
 <div>
-   <img id="blue" src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled" /><br /><!--
+   <img id="blue" src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled" /><!--
 --><img id="orange" src="support/swatch-orange.png" width="30" height="30" alt="Image download support must be enabled" />
 </div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht
similarity index 81%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht
index d98ec5ac1ba..9185e929736 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht
@@ -7,11 +7,12 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-006-ref"; }
+            @top-right { content: "Test vertical-alignment-004-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-09-01 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
     img
@@ -21,13 +22,9 @@
 
     img
     {
-      padding-left: 15px; /* = the position of first orange square */
+      padding-left: 60px; /* =  position of orange squares */
     }
 
-    img + br + img
-    {
-      padding-left: 15px; /* = the position of second orange square*/
-    }
   ]]></style>
 
 </head>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht
similarity index 76%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht
index 5e1af1ce375..e217a7c84a7 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht
@@ -7,11 +7,12 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-004-ref"; }
+            @top-right { content: "Test vertical-alignment-006-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-09-03 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
     img
@@ -26,7 +27,7 @@
 
     img + br + img
     {
-      padding-left: 60px; /* = the position of second orange square*/
+      padding-left: 90px; /* = the position of second orange square*/
     }
   ]]></style>
 
@@ -34,7 +35,7 @@
 
 <body>
 
-<p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+<p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
 <div>
    <img src="support/swatch-orange.png" width="60" height="60" alt="Image download support must be enabled" /><br /><!--
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht
similarity index 59%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht
index d6cb41d1d4f..513ae51dfa9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht
@@ -7,21 +7,17 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-008-ref"; }
+            @top-right { content: "Test vertical-alignment-008-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-09-03 -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
-    img
-    {
-      vertical-align: top;
-    }
-
     img#orange
     {
-      padding-top: 60px; /* = the height of first character */
+      padding-left: 30px;
     }
   ]]></style>
 
@@ -29,11 +25,11 @@
 
 <body>
 
-<p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+<p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
 <div>
-   <img src="support/swatch-blue.png" width="120" height="120" alt="Image download support must be enabled" /><!--
---><img id="orange" src="support/swatch-orange.png" width="60" height="60" alt="Image download support must be enabled" />
+  <img id="orange" src="support/swatch-orange.png" width="30" height="30" alt="Image download support must be enabled" /><!--
+--><img src="support/swatch-blue.png" width="60" height="60" alt="Image download support must be enabled" />
 </div>
 
 </body>
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 ae8b6525a3e..9a3cc59f0bb 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
@@ -2208,6 +2208,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="bidi-011" class="">
       <tr>
         <td rowspan="1" title="The bidi algorithm and inlines in CSS wrapping bidi formatting characters">
@@ -5752,67 +5760,67 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-002" class="ahem">
+    <tbody id="vertical-alignment-002" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'top' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-002.xht">vertical-alignment-new-002</a></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+          <a href="vertical-alignment-002.xht">vertical-alignment-002</a></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-003" class="ahem">
+    <tbody id="vertical-alignment-003" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'top' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-003.xht">vertical-alignment-new-003</a></td>
-        <td><a href="reference/vertical-alignment-new-002-ref.xht">=</a> </td>
+          <a href="vertical-alignment-003.xht">vertical-alignment-003</a></td>
+        <td><a href="reference/vertical-alignment-002-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-004" class="ahem">
+    <tbody id="vertical-alignment-004" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-top' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-004.xht">vertical-alignment-new-004</a></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+          <a href="vertical-alignment-004.xht">vertical-alignment-004</a></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-005" class="ahem">
+    <tbody id="vertical-alignment-005" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-top' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-005.xht">vertical-alignment-new-005</a></td>
-        <td><a href="reference/vertical-alignment-new-004-ref.xht">=</a> </td>
+          <a href="vertical-alignment-005.xht">vertical-alignment-005</a></td>
+        <td><a href="reference/vertical-alignment-004-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-006" class="ahem">
+    <tbody id="vertical-alignment-006" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-bottom' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-006.xht">vertical-alignment-new-006</a></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+          <a href="vertical-alignment-006.xht">vertical-alignment-006</a></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-007" class="ahem">
+    <tbody id="vertical-alignment-007" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'text-bottom' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-007.xht">vertical-alignment-new-007</a></td>
-        <td><a href="reference/vertical-alignment-new-006-ref.xht">=</a> </td>
+          <a href="vertical-alignment-007.xht">vertical-alignment-007</a></td>
+        <td><a href="reference/vertical-alignment-006-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-008" class="ahem">
+    <tbody id="vertical-alignment-008" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'bottom' and vertical-rl writing-mode">
-          <a href="vertical-alignment-new-008.xht">vertical-alignment-new-008</a></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+          <a href="vertical-alignment-008.xht">vertical-alignment-008</a></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="vertical-alignment-new-009" class="ahem">
+    <tbody id="vertical-alignment-009" class="ahem">
       <tr>
         <td rowspan="1" title="vertical-align - 'bottom' and vertical-lr writing-mode">
-          <a href="vertical-alignment-new-009.xht">vertical-alignment-new-009</a></td>
-        <td><a href="reference/vertical-alignment-new-008-ref.xht">=</a> </td>
+          <a href="vertical-alignment-009.xht">vertical-alignment-009</a></td>
+        <td><a href="reference/vertical-alignment-008-ref.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
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 2a87383aaf9..5ffb00048c3 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
@@ -272,6 +272,7 @@ baseline-inline-replaced-003.xht == reference/baseline-inline-replaced-002-ref.x
 bidi-001.xht == reference/bidi-001-ref.xht
 bidi-002.xht == reference/bidi-002-ref.xht
 bidi-003.xht == reference/bidi-003-ref.xht
+bidi-004.xht == reference/bidi-004-ref.xht
 bidi-011.xht == reference/bidi-011-ref.xht
 bidi-box-model-001.xht == reference/bidi-box-model-001-ref.xht
 bidi-box-model-002.xht == reference/bidi-box-model-001-ref.xht
@@ -715,14 +716,14 @@ unicode-bidi-applies-to-012.xht == reference/direction-applies-to-008-ref.xht
 unicode-bidi-applies-to-013.xht == reference/direction-applies-to-008-ref.xht
 unicode-bidi-applies-to-014.xht == reference/direction-applies-to-008-ref.xht
 unicode-bidi-applies-to-015.xht == reference/direction-applies-to-008-ref.xht
-vertical-alignment-new-002.xht == reference/vertical-alignment-new-002-ref.xht
-vertical-alignment-new-003.xht == reference/vertical-alignment-new-002-ref.xht
-vertical-alignment-new-004.xht == reference/vertical-alignment-new-004-ref.xht
-vertical-alignment-new-005.xht == reference/vertical-alignment-new-004-ref.xht
-vertical-alignment-new-006.xht == reference/vertical-alignment-new-006-ref.xht
-vertical-alignment-new-007.xht == reference/vertical-alignment-new-006-ref.xht
-vertical-alignment-new-008.xht == reference/vertical-alignment-new-008-ref.xht
-vertical-alignment-new-009.xht == reference/vertical-alignment-new-008-ref.xht
+vertical-alignment-002.xht == reference/vertical-alignment-002-ref.xht
+vertical-alignment-003.xht == reference/vertical-alignment-002-ref.xht
+vertical-alignment-004.xht == reference/vertical-alignment-004-ref.xht
+vertical-alignment-005.xht == reference/vertical-alignment-004-ref.xht
+vertical-alignment-006.xht == reference/vertical-alignment-006-ref.xht
+vertical-alignment-007.xht == reference/vertical-alignment-006-ref.xht
+vertical-alignment-008.xht == reference/vertical-alignment-008-ref.xht
+vertical-alignment-009.xht == reference/vertical-alignment-008-ref.xht
 writing-mode-horizontal-001l.xht == reference/writing-mode-horizontal-001l-ref.xht
 writing-mode-horizontal-001r.xht == reference/writing-mode-horizontal-001r-ref.xht
 writing-mode-stretch-001.xht == reference/writing-mode-stretch-001-ref.xht
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 55fe227049b..c3749e5731e 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,7 +27,7 @@
     <tbody id="s2">
       <tr><th><a href="chapter-2.xht">Chapter 2 - 
         Inline Direction and Bidirectionality</a></th>
-      <td>(162 Tests)</td></tr>
+      <td>(163 Tests)</td></tr>
     </tbody>
     <tbody id="s3">
       <tr><th><a href="chapter-3.xht">Chapter 3 - 
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         Inline-level Alignment</a></th>
-      <td>(70 Tests)</td></tr>
+      <td>(38 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
@@ -52,7 +52,7 @@
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
         Abstract Box Layout</a></th>
-      <td>(489 Tests)</td></tr>
+      <td>(495 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vlr-003.xht
new file mode 100644
index 00000000000..aad7a732cd0
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vlr-003.xht
@@ -0,0 +1,58 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</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 underline-font-size-vlr-003"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger">ᠨᠨ</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vlr-005.xht
new file mode 100644
index 00000000000..0936a7ddb2a
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vlr-005.xht
@@ -0,0 +1,57 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</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 underline-font-size-vlr-005"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span id="larger" lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vrl-002.xht
new file mode 100644
index 00000000000..c45edfda5a3
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vrl-002.xht
@@ -0,0 +1,58 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes</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 underline-font-size-vrl-002"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+  <link rel="bookmark" href="http://www.w3.org/TR/css-text-decor-3/leftline-cross.png" title="" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger">方方</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vrl-004.xht
new file mode 100644
index 00000000000..7b2bb32d723
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-font-size-vrl-004.xht
@@ -0,0 +1,57 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' with various font sizes and mixed text</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 underline-font-size-vrl-004"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text or even if font size of text is larger." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+
+  span#larger
+    {
+      font-size: 1.5em;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span id="larger" lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-mixed-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-mixed-vlr-003.xht
new file mode 100644
index 00000000000..badb75c7b6e
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-mixed-vlr-003.xht
@@ -0,0 +1,52 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</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 underline-mixed-vlr-003"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-lr;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="mn" xml:lang="mn">ᠨ<span lang="en" xml:lang="en">AB</span>ᠨ</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-mixed-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-mixed-vrl-002.xht
new file mode 100644
index 00000000000..5bbdd9c1d92
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/underline-mixed-vrl-002.xht
@@ -0,0 +1,52 @@
+<!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" lang="en" xml:lang="en">
+
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <title>CSS Writing Modes Test: 'text-decoration: underline' and mixed text</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 underline-mixed-vrl-002"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" title="7.5 Line-Relative Mappings" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#text-underline-position-property" title="2.6. Text Underline Position: the 'text-underline-position' property" />
+
+  <meta content="" name="flags" />
+  <meta content="This test checks that when latin and east-asian glyphs 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 even if that cuts through glyphs of descendant text or through em box of descendant text." name="assert" />
+
+  <style type="text/css"><![CDATA[
+  div#vrl
+    {
+      font-size: 4em;
+      margin-left: 2em;
+      writing-mode: vertical-rl;
+    }
+
+  span#outer
+    {
+      text-decoration: underline;
+    }
+
+  span#inner
+    {
+      color: transparent;
+    }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>one and only one vertical straight and unbroken line</strong>. Such line should have the same thickness over its entire length.</p>
+
+  <div id="vrl"><span id="outer"><span id="inner" lang="ja" xml:lang="ja">方<span lang="en" xml:lang="en">AB</span>方</span></span></div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht
similarity index 85%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht
index eae736e39bc..e2669946343 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht
@@ -7,15 +7,16 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-002"; }
+            @top-right { content: "Test vertical-alignment-002"; }
             @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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-002-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-002-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
@@ -30,6 +31,7 @@
       font-size: 0.5em;
       color: orange;
       vertical-align: top;
+      margin-top: -1em;
     }
     ]]></style>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002a.xht
deleted file mode 100644
index cf573c818c2..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'baseline' (alphabetical baseline 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 vertical-alignment-002a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002b.xht
deleted file mode 100644
index e51ffe2e15d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'baseline' (alphabetical baseline 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 vertical-alignment-002b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht
similarity index 78%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht
index a0193e452ef..d17dec286c5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht
@@ -7,30 +7,31 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-003"; }
+            @top-right { content: "Test vertical-alignment-003"; }
             @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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-002-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-002-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
-      border-right: blue solid 2em;
       writing-mode: vertical-lr;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: top;
-      line-height: 1;
+      margin-top: -1em;
     }
     ]]></style>
 
@@ -38,7 +39,7 @@
 
   <body>
 
-  <p>Test passes if the right edge of an orange square touches the left edge of a blue square.</p>
+  <p>Test passes if the right edge of an blue square is aligned with the left edge of a orange square.</p>
 
   <div id="lr">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003a.xht
deleted file mode 100644
index 04231bcd3ca..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003a.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'baseline' (central baseline 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 vertical-alignment-003a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003b.xht
deleted file mode 100644
index 9ddae8e8f38..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003b.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'baseline' (central baseline 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 vertical-alignment-003b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht
similarity index 84%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht
index 9ef82e46758..ba46a8cefe7 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht
@@ -7,21 +7,22 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-004"; }
+            @top-right { content: "Test vertical-alignment-004"; }
             @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-09-01 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-004-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-004-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
     {
       color: orange;
-      font: 3.75em/3 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-rl;
     }
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht
index 178e6d0c940..ee797fb4462 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht
@@ -7,21 +7,22 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-005"; }
+            @top-right { content: "Test vertical-alignment-005"; }
             @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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-004-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-004-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-lr;
     }
 
@@ -29,7 +30,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-top;
-      line-height: 1;
     }
 
     ]]></style>
@@ -38,7 +38,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="lr">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005a.xht
deleted file mode 100644
index 515c3adc9e6..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'sub' (alphabetical baseline 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 vertical-alignment-005a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005b.xht
deleted file mode 100644
index 308df9de355..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'sub' (alphabetical baseline 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 vertical-alignment-005b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht
index d03b211cb92..b0f034d0da9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht
@@ -7,21 +7,22 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-006"; }
+            @top-right { content: "Test vertical-alignment-006"; }
             @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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-006-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-006-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-rl;
     }
 
@@ -29,7 +30,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-bottom;
-      line-height: 1;
     }
 
     ]]></style>
@@ -38,7 +38,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="rl">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht
index b957b46bdfb..bdcbdcddae9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht
@@ -7,21 +7,22 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-007"; }
+            @top-right { content: "Test vertical-alignment-007"; }
             @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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area." />
-    <link rel="match" href="reference/vertical-alignment-new-006-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-006-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
       color: orange;
-      font: 3.75em/1.5 Ahem; /* computes to 60px/90px */
+      font: 3.75em/3 Ahem; /* computes to 60px/180px */
       writing-mode: vertical-lr;
     }
 
@@ -29,7 +30,6 @@
     {
       font-size: 0.5em; /* computes to 30px */
       vertical-align: text-bottom;
-      line-height: 1;
     }
 
     ]]></style>
@@ -38,7 +38,7 @@
 
   <body>
 
-  <p>Test passes if the <strong>left edge</strong> of an irregular orange polygon is straight and unbroken.</p>
+  <p>Test passes if the <strong>right edge</strong> of an irregular orange polygon is straight and unbroken.</p>
 
   <div id="lr">A<span id="orange30">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht
index 4e6bcfd73b1..4d48a0e2d7a 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht
@@ -7,30 +7,31 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-008"; }
+            @top-right { content: "Test vertical-alignment-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-09-03 -->
    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
    <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
    <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-008-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-008-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#rl
     {
-      border-left: blue solid 2em;
       writing-mode: vertical-rl;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: bottom;
-      line-height: 1;
+      margin-top: -1em;
     }
 
     ]]></style>
@@ -39,7 +40,7 @@
 
   <body>
 
-  <p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+  <p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
   <div id="rl">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008a.xht
deleted file mode 100644
index 39e076ec2ec..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'super' (alphabetical baseline 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 vertical-alignment-008a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008b.xht
deleted file mode 100644
index ed5b75e937b..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'super' (alphabetical baseline 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 vertical-alignment-008b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht
similarity index 79%
rename from tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht
rename to tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht
index 143cc7ff57c..0f2c34dde6d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht
@@ -7,30 +7,31 @@
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Writing Modes Module Level 3 CR Test Suite"; }
-            @top-right { content: "Test vertical-alignment-new-009"; }
+            @top-right { content: "Test vertical-alignment-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-09-03 -->
     <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-lr', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box." />
-    <link rel="match" href="reference/vertical-alignment-new-008-ref.xht" />
+    <link rel="match" href="reference/vertical-alignment-008-ref.xht" />
     <meta name="flags" content="ahem" />
     <style type="text/css"><![CDATA[
     div#lr
     {
-      border-left: blue solid 2em;
       writing-mode: vertical-lr;
       font: 3.75em/3 Ahem; /* computes to 60px/180px */
-      color: white;
+      color: blue;
     }
 
     span#orange
     {
+      font-size: 0.5em;
       color: orange;
       vertical-align: bottom;
-      line-height: 1;
+      margin-top: -1em;
     }
 
     ]]></style>
@@ -39,7 +40,7 @@
 
   <body>
 
-  <p>Test passes if the left edge of an orange square touches the right edge of a blue square.</p>
+  <p>Test passes if the left edge of an blue square is aligned with the right edge of a orange square.</p>
 
   <div id="lr">A<span id="orange">O</span></div>
 
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-011a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-011a.xht
deleted file mode 100644
index efd00125820..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-011a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero length (0em)' (alphabetical baseline 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 vertical-alignment-011a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-011b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-011b.xht
deleted file mode 100644
index cf22e2f7b57..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-011b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero length (0em)' (alphabetical baseline 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 vertical-alignment-011b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-012l.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-012l.xht
deleted file mode 100644
index 39c5614a37f..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-012l.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero length (0em)' (central baseline 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 vertical-alignment-012l"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-012r.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-012r.xht
deleted file mode 100644
index c1b546631bf..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-012r.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero length (0em)' (central baseline 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 vertical-alignment-012r"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-014a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-014a.xht
deleted file mode 100644
index 3a2babef9fc..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-014a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline 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 vertical-alignment-014a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-014b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-014b.xht
deleted file mode 100644
index 16776bf95db..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-014b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline 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 vertical-alignment-014b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-015a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-015a.xht
deleted file mode 100644
index 3ee6c91814c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-015a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive length (0.5em)' (central baseline 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 vertical-alignment-015a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-015b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-015b.xht
deleted file mode 100644
index 52315d31fa2..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-015b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive length (0.5em)' (central baseline 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 vertical-alignment-015b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-017a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-017a.xht
deleted file mode 100644
index 31ec777911d..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-017a.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline 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 vertical-alignment-017a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-017b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-017b.xht
deleted file mode 100644
index dd9e53ebabe..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-017b.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline 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 vertical-alignment-017b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-018a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-018a.xht
deleted file mode 100644
index 399cf4bb673..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-018a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative length (-0.5em)' (central baseline 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 vertical-alignment-018a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-018b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-018b.xht
deleted file mode 100644
index 4fcec20fb39..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-018b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative length (-0.5em)' (central baseline 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 vertical-alignment-018b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-020a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-020a.xht
deleted file mode 100644
index 4ced50f0059..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-020a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline 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 vertical-alignment-020a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-020b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-020b.xht
deleted file mode 100644
index 48d8233e817..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-020b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline 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 vertical-alignment-020b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-021a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-021a.xht
deleted file mode 100644
index b1aeb1c1b0a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-021a.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero percentage (0%)' (central baseline 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 vertical-alignment-021a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-021b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-021b.xht
deleted file mode 100644
index a9b8e801bb9..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-021b.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero percentage (0%)' (central baseline 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 vertical-alignment-021b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-023a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-023a.xht
deleted file mode 100644
index df79b166512..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-023a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline 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 vertical-alignment-023a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-023b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-023b.xht
deleted file mode 100644
index 8093fa74527..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-023b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive percentage (80%)' (alphabetical baseline 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 vertical-alignment-023b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-024a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-024a.xht
deleted file mode 100644
index f56e2cb8d1c..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-024a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive percentage (50%)' (central baseline 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 vertical-alignment-024a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-024b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-024b.xht
deleted file mode 100644
index a73495db5d2..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-024b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive percentage (50%)' (central baseline 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 vertical-alignment-024b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-026a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-026a.xht
deleted file mode 100644
index b8cd9b7bb10..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-026a.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative percentage (-20%)' (alphabetical baseline 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 vertical-alignment-026a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-026b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-026b.xht
deleted file mode 100644
index bc48e3c4eef..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-026b.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative length (-20%)' (alphabetical baseline 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 vertical-alignment-026b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-027a.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-027a.xht
deleted file mode 100644
index eb69dd2a980..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-027a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative percentage (-50%)' (central baseline 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 vertical-alignment-027a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-027b.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-027b.xht
deleted file mode 100644
index 9e4df412e86..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1print/vertical-alignment-027b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative percentage (-50%)' (central baseline 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 vertical-alignment-027b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-001.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-001.htm
index 8211c8a7175..f0c01fcc847 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP Charset vs BOM</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="reference/at-charset-001-ref.htm">
         <meta name="flags" content="http">
         <meta name="assert" content="The Byte Order Mark in the stylesheet overrides the HTTP charset setting.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-002.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-002.htm
index 53d1e968049..6c2a797197c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-002.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP Charset over @charset</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="http">
         <meta name="assert" content="The HTTP charset setting overrides the @charset designation in the stylesheet.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-003.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-003.htm
index 7272045e7f6..43603b11bce 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-003.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over link charset</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="http">
         <meta name="assert" content="The HTTP charset setting overrides the charset designation in the link tag.">
         <link charset="windows-1252" href="support/at-charset-003.css" rel="Stylesheet">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-004.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-004.htm
index 3815a1b1331..4cd63461e98 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-004.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over set referring code page (UTF-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="http">
         <meta name="assert" content="The HTTP charset setting overrides the referring document's code page.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-005.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-005.htm
index ff6a1fd7d9e..1539b7ba972 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-005.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over set referring code page (windows-1252)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="http">
         <meta name="assert" content="The HTTP charset setting overrides the charset designation in the referring document's meta tag.">
         <meta http-equiv="Content-Type" content="text/html; windows-1252">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-006.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-006.htm
index 51d626a32bb..2f9e02b173b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-006.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over referring code page (not set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="http">
         <meta name="assert" content="The HTTP charset setting overrides the charset of referring document.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-007.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-007.htm
index cd94ed2ee12..a25440c012d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-007.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset over link charset attribute</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The @charset setting in the stylesheet overrides the charset attribute of the link element.">
         <link rel="Stylesheet" href="support/at-charset-007.css" charset="windows-1252">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-008.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-008.htm
index ede2427d26e..899524a73e0 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-008.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset over referring document's code page (set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The @charset setting in the stylesheet overrides the referring document's set code page.">
         <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-009.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-009.htm
index f91a9e6147b..fb45f84da71 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-009.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset over referring document's code page (unset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The @charset setting in the stylesheet overrides the referring document's unset code page.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-010.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-010.htm
index 0bc1c10d3d0..87069fae9aa 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-010.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Link charset attribute over referring document's codepage (set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page.">
         <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-011.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-011.htm
index 55c365e7e50..c636e99f295 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-011.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-011.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Link charset attribute over referring document's codepage (not set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page.">
         <link rel="stylesheet" href="support/at-charset-011.css" charset="shift-JIS">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-012.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-012.htm
index 44a41401b14..4bfa52d6833 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-012.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-012.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Stylesheet encoding via the referring document's encoding (set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet's encoding is determined by the set encoding of the referring document.">
         <meta http-equiv="Content-Type" content="text/html; charset=shift-JIS">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-014.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-014.htm
index 14d299c919a..77bdb80eced 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-014.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-014.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Matching BOM and @charset (utf-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-015.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-015.htm
index b579ed1e8e9..c13fb3d1ac6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-015.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-015.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Matching BOM and @charset (utf-16 LE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-016.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-016.htm
index 9734c2b4dc0..2b30d9bfef9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-016.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-016.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Matching BOM and @charset (utf-16 BE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-019.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-019.htm
index ee584e274b8..c11f78efc8c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-019.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-019.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: BOM with no @charset (utf-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-8.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-020.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-020.htm
index 682880f337a..24ebf1dee7d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-020.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-020.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: BOM with no @charset (utf-16LE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-16LE.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-021.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-021.htm
index acfdf4dcd26..8003d1e12a1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-021.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-021.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: BOM with no @charset (utf-16BE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-16BE.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-024.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-024.htm
index 2b72aa25ebe..0915f531d15 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-024.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-024.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (windows-1252)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as windows-1252.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-025.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-025.htm
index 10c1f56174e..7a960509738 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-025.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-025.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (Shift-JIS)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as Shift-JIS.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-026.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-026.htm
index 4aa6a73d761..22dd7ca2d1b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-026.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-026.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (ISO-8859-6)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as ISO-8859-6.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-027.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-027.htm
index 2db43091944..1443f909166 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-027.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-027.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (Big5)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as Big5.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-028.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-028.htm
index d1eed3482ca..a045c8b96d2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-028.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-028.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (UTF-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is correctly interpreted as UTF-8.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-029.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-029.htm
index a624c9d60a4..74fe8bdcd6b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-029.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-029.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (UTF-16LE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16LE.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-030.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-030.htm
index 66a059d7249..9df12363966 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-030.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-030.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (UTF-16BE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16BE.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-040.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-040.htm
index b20dcffe0ac..e3b5e97e64e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-040.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-040.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Non-matching @charset (UTF-16BE with UTF-8 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is thrown out due to the mismatched @charset.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-041.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-041.htm
index 7e54e1ecdb2..502851c8553 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-041.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-041.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Non-matching @charset (UTF-32LE with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is thrown out due to the mismatched @charset.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-042.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-042.htm
index c566c06f01f..79ae85d4039 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-042.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-042.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is interpreted as UTF-8.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-043.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-043.htm
index b710839e737..50f67b96c5a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-043.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-043.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is interpreted as UTF-8.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-044.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-044.htm
index 49e7581149c..2977ba50ca7 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-044.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-044.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="UTF-32 is not supported.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-045.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-045.htm
index a77f3040970..08eac015d38 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-045.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-045.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is interpreted as UTF-16LE.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-046.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-046.htm
index 5def446a0b6..a87f3ab9906 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-046.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-046.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is interpreted as UTF16BE.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-047.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-047.htm
index 0e22bbfbf63..3f1c11a90f1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-047.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-047.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Endianness not specified (UTF-16LE encoding with UTF-16 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16LE.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-048.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-048.htm
index 406bf70c734..2586de3b8af 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-048.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-048.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Endianness not specified (UTF-16BE encoding with UTF-16 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is not interpreted as UTF16-BE.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-054.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-054.htm
index be98a7a123a..2a49833a163 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-054.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-054.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset in uppercase</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="reference/filler-text-below-green.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The selector does not match due to the @charset being ignored.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-056.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-056.htm
index d603cf760bb..3679501149a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-056.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-056.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset missing a space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="reference/filler-text-below-green.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The selector does not match due to the @charset being ignored.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-060.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-060.htm
index 7af09acfafb..2344fca0ad9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-060.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-060.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset with bogus name</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="at-charset-001.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The stylesheet is interpreted as UTF-16LE based on BOM.">
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="平和">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-061.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-061.htm
index c65c31bf529..6a5e08dc2d0 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-061.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-061.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset within style block</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+        <link rel="match" href="reference/filler-text-below-green.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The selector does not match due to the @charset being ignored.">
         <style type="text/css">@charset "ISO-8859-1";
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-charset-071.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-071.htm
index 27e2b956d2c..d8cc710a22e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-071.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-071.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/001.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-071.css">
  </head>
  <body>
-  <p class="t&#233;st">This line should be green.</p>
+  <p class="t&#233;st">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/at-charset-072.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-072.htm
index b49cb2cf514..a0223e07cba 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-072.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-072.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/002.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-072.css">
  </head>
  <body>
-  <p class="t&#3657;st">This line should be green.</p>
+  <p class="t&#3657;st">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/at-charset-073.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-073.htm
index 8457aa2380a..d211150741f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-073.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-073.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/003.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-073.css">
  </head>
  <body>
-  <p class="t&#1097;st">This line should be green.</p>
+  <p class="t&#1097;st">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/at-charset-074.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-074.htm
index a555655f3d3..098d5c8c057 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-074.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-074.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/004.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-074.css">
  </head>
  <body>
-  <p class="t&#1609;st">This line should be green.</p>
+  <p class="t&#1609;st">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/at-charset-075.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-075.htm
index 9507d809346..c1b63c6bfa2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-075.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-075.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/005.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-075.css">
  </head>
  <body>
-  <p class="t&#953;st">This line should be green.</p>
+  <p class="t&#953;st">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/at-charset-076.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-076.htm
index 65928a48b19..77379501377 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-076.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-076.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/006.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-076.css">
  </head>
  <body>
-  <p class="t&#1497;st">This line should be green.</p>
+  <p class="t&#1497;st">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/at-charset-077.htm b/tests/wpt/css-tests/css21_dev/html4/at-charset-077.htm
index 1b112c9e0ff..1352dca3882 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-charset-077.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-charset-077.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/007.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="http">
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-077.css">
  </head>
  <body>
-  <p class="t&#1048;st">This line should be green.</p>
+  <p class="t&#1048;st">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/at-import-009.htm b/tests/wpt/css-tests/css21_dev/html4/at-import-009.htm
index 7a92282100f..3c461ddcea9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-import-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-import-009.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @import following a known but invalid @rule</title>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+        <link rel="match" href="reference/ref-this-text-should-be-green.htm">
         <meta name="flags" content="invalid">
         <meta name="assert" content="@import is respected after known but ignored @rule.">
         <style type="text/css">
@@ -14,6 +15,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-import-010.htm b/tests/wpt/css-tests/css21_dev/html4/at-import-010.htm
index ba32bd1c985..6bc8b5cb4cd 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-import-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-import-010.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @import following an invalid selector</title>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+        <link rel="match" href="reference/ref-this-text-should-be-green.htm">
         <meta name="flags" content="invalid">
         <meta name="assert" content="@import is respected after invalid (ignored) rule set">
         <style type="text/css">
@@ -13,6 +14,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-import-011.htm b/tests/wpt/css-tests/css21_dev/html4/at-import-011.htm
index 4df47133487..6565cd1fac7 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-import-011.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-import-011.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: @import following garbage</title>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+        <link rel="match" href="reference/ref-this-text-should-be-green.htm">
         <meta name="flags" content="invalid">
         <meta name="assert" content="@import is parsed as part of invalid ruleset           after garbage.">
         <style type="text/css">
@@ -14,6 +15,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-keywords-000.htm b/tests/wpt/css-tests/css21_dev/html4/at-keywords-000.htm
index 7c52604174b..567991a88a3 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-keywords-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-keywords-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
 
   @import "support/import-green.css";
@@ -14,7 +15,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-keywords-001.htm b/tests/wpt/css-tests/css21_dev/html4/at-keywords-001.htm
index a8db663c2e1..d6b488f68ad 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-keywords-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-keywords-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
 
   @ import "support/import-red.css";
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-keywords-002.htm b/tests/wpt/css-tests/css21_dev/html4/at-keywords-002.htm
index e2e931f4b9d..ea863b3dc6b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-keywords-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-keywords-002.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
 
@@ -15,7 +16,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-rule-013.htm b/tests/wpt/css-tests/css21_dev/html4/at-rule-013.htm
index 045b1a2c9d2..9b9c327225c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-rule-013.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-rule-013.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule">
+  <link rel="match" href="reference/at-rule-013-ref.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="At-rules inside @media blocks are ignored up to         up to the end of the block that contains the invalid at-keyword, or up         to and including the next semicolon (;) or up to and including the next         block ({...}), whichever comes first.">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-rules-000.htm b/tests/wpt/css-tests/css21_dev/html4/at-rules-000.htm
index 74b87a5c636..3e37c0d8e58 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-rules-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-rules-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
 
@@ -17,7 +18,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-rules-001.htm b/tests/wpt/css-tests/css21_dev/html4/at-rules-001.htm
index a93c7403822..130e84c74d5 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-rules-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-rules-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
 
   p { color: red; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-rules-002.htm b/tests/wpt/css-tests/css21_dev/html4/at-rules-002.htm
index 6a0dfa7cb39..f2ae08d7172 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-rules-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-rules-002.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
 
   p { color: red; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-rules-003.htm b/tests/wpt/css-tests/css21_dev/html4/at-rules-003.htm
index f300e9f4c93..7b15a5b21e0 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-rules-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-rules-003.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
 
   p { color: red; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/at-rules-004.htm b/tests/wpt/css-tests/css21_dev/html4/at-rules-004.htm
index fd4aea78d8b..682b111e8cd 100644
--- a/tests/wpt/css-tests/css21_dev/html4/at-rules-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/at-rules-004.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
 
   p { color: green; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/attribute-token-selector-002.htm b/tests/wpt/css-tests/css21_dev/html4/attribute-token-selector-002.htm
index 78d1c2c661a..a3d29b803c1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/attribute-token-selector-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/attribute-token-selector-002.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: [attr~=""]Attribute Selectors with Empty String Values</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">
+  <link rel="match" href="reference/attribute-token-selector-002-ref.htm">
   <meta name="assert" content="[attr~=''] is valid but matches nothing.">
   <style type="text/css">
     p {
diff --git a/tests/wpt/css-tests/css21_dev/html4/bidi-004.htm b/tests/wpt/css-tests/css21_dev/html4/bidi-004.htm
new file mode 100644
index 00000000000..73639ffe3d4
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/bidi-004.htm
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+ <head>
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html">
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model">
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules">
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes">
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
+  <link rel="help" href="http://unicode.org/reports/tr9/">
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0"> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.htm">
+
+  <meta name="flags" content="may21 ahem">
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp &#x202E; ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX &#x202C; XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/blocks-001.htm b/tests/wpt/css-tests/css21_dev/html4/blocks-001.htm
index f670f4a3401..283f0892ceb 100644
--- a/tests/wpt/css-tests/css21_dev/html4/blocks-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/blocks-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing nested blocks and strings in style blocks</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#block">
+        <link rel="match" href="reference/blocks-001-ref.htm">
         <meta name="flags" content="invalid">
         <meta name="assert" content="Blocks and strings are parsed with matching terminating pairs.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/c547-indent-000.htm b/tests/wpt/css-tests/css21_dev/html4/c547-indent-000.htm
index 27cfdf558ef..b59a06f8479 100644
--- a/tests/wpt/css-tests/css21_dev/html4/c547-indent-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/c547-indent-000.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/REC-CSS1#text-indent">
   <link rel="author" title="CSS1 Test Suite Contributors" href="http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html">
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
+  <link rel="match" href="reference/c547-indent-000-ref.htm">
   <style type="text/css">
    div { font: 24px/1 Ahem; width: 18em; color: blue; }
    .one {text-indent: 0.25in;}
diff --git a/tests/wpt/css-tests/css21_dev/html4/c5510-padn-000.htm b/tests/wpt/css-tests/css21_dev/html4/c5510-padn-000.htm
index b848e385cc3..28ce0ea5d71 100644
--- a/tests/wpt/css-tests/css21_dev/html4/c5510-padn-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/c5510-padn-000.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/REC-CSS1#padding">
   <link rel="author" title="CSS1 Test Suite Contributors" href="http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html">
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
+  <link rel="match" href="reference/c5510-padn-000-ref.htm">
 
   <style type="text/css">
    body { color: navy; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-001.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-001.htm
index 04c973319ba..09afe8d1460 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-001.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <script type="text/javascript">
    var style = document.createElement("style");
    var text = document.createTextNode("body { color: red; }");
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-002.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-002.htm
index 33fb692332e..909b351cd52 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-002.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <script type="text/javascript">
    var style = document.createElementNS("http://www.w3.org/1999/xhtml", "link");
    style.setAttribute("type", "text/css");
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-003.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-003.htm
index 95c370b9edd..f0a3a168983 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-003.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <script type="text/javascript" id="script">
    var style = document.createElement("style");
    var text = document.createTextNode("body { color: red }");
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-004.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-004.htm
index 5e6f0aaa334..c91e25396af 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-004.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <script type="text/javascript" id="script">
    var style = document.createElementNS("http://www.w3.org/1999/xhtml", "link");
    style.setAttribute("type", "text/css");
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-005.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-005.htm
index f695c5ac8d0..c9082857b1a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-005.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css" id="style">
    body { color: blue }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-006.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-006.htm
index bb1d7aef85c..4bac8e2fd00 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-006.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <link rel="stylesheet" type="text/css" id="link" href="support/import-red.css">
   <script type="text/javascript">
    document.getElementsByTagName("head")[0].removeChild(document.getElementById("link"));
diff --git a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-control.htm b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-control.htm
index 40595239b38..4f9a272eacc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-control.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/cascade-import-dynamic-control.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css" id="test">
    p { color: red; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-000.htm b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-000.htm
index f72ec481ab3..8521afbc6eb 100644
--- a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of Properties and Keywords (background)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p { color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-001.htm b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-001.htm
index 4cca6bd7aeb..8102b421170 100644
--- a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of At-rules (@media)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p { color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-003.htm b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-003.htm
index 62bed4201e0..a8e2a7ea58b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-003.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of pseudo-classes and pseudo-elements</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/case-sensitive-003-ref.htm">
   <meta name="assert" content="Pseudo-class and pseudo-element names are ASCII         case-insensitive.">
   <style type="text/css">
     * { color: red; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-004.htm b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-004.htm
index 35cd6b10492..691c5398431 100644
--- a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-004.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of :lang() arguments</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/case-sensitive-003-ref.htm">
   <meta name="assert" content="The argument to :lang() is ASCII case-insensitive.">
   <style type="text/css">
     .test-folding { color: red; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-005.htm b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-005.htm
index 2ae629627fe..70144246608 100644
--- a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-005.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of counter names</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/case-sensitive-005-ref.htm">
   <meta name="assert" content="Counter names are case-sensitive.">
   <style type="text/css">
     .reset { counter-reset: test 5 tEsT 9; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-006.htm b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-006.htm
index 97aa797c4eb..211bfecd71b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/case-sensitive-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/case-sensitive-006.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Case sensitivity with element selectors</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+        <link rel="match" href="reference/filler-text-below-green.htm">
         <meta name="flags" content="HTMLonly">
         <meta name="assert" content="Element selectors are case-insensitive in HTML.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-10.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-10.htm
index 4979ded2152..f7741644c42 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-10.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-10.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model details (1481 tests)</h2>
+  <h2>Visual formatting model details (1449 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -19175,7 +19175,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s10.8">+</a>
         <a href="http://www.w3.org/TR/CSS21/visudet.html#line-height">10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a></th></tr>
-      <!-- 56 tests -->
+      <!-- 24 tests -->
       <tr id="c43-center-000-10.8" class="ahem image">
         <td>
             <a href="c43-center-000.htm">c43-center-000</a></td>
@@ -19383,358 +19383,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-002a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-002a.htm">vertical-alignment-002a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-002b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-002b.htm">vertical-alignment-002b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-003a.htm">vertical-alignment-003a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-003b.htm">vertical-alignment-003b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-005a.htm">vertical-alignment-005a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-005b.htm">vertical-alignment-005b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-008a.htm">vertical-alignment-008a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-008b.htm">vertical-alignment-008b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-011a.htm">vertical-alignment-011a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-011b.htm">vertical-alignment-011b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012l-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-012l.htm">vertical-alignment-012l</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012r-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-012r.htm">vertical-alignment-012r</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-014a.htm">vertical-alignment-014a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-014b.htm">vertical-alignment-014b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-015a.htm">vertical-alignment-015a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-015b.htm">vertical-alignment-015b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-017a.htm">vertical-alignment-017a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-017b.htm">vertical-alignment-017b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-018a.htm">vertical-alignment-018a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-018b.htm">vertical-alignment-018b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-020a.htm">vertical-alignment-020a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-020b.htm">vertical-alignment-020b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-021a.htm">vertical-alignment-021a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-021b.htm">vertical-alignment-021b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-023a.htm">vertical-alignment-023a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-023b.htm">vertical-alignment-023b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-024a.htm">vertical-alignment-024a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-024b.htm">vertical-alignment-024b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-026a.htm">vertical-alignment-026a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-026b.htm">vertical-alignment-026b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-027a.htm">vertical-alignment-027a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-027b.htm">vertical-alignment-027b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
     </tbody>
     <tbody id="s10.8.1">
       <tr><th colspan="4" scope="rowgroup">
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 5f660fbbee8..14cecf80c16 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-12.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-12.htm
@@ -3943,7 +3943,7 @@
       <tr id="content-counter-000-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-000.htm">content-counter-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -3951,7 +3951,7 @@
       <tr id="content-counter-001-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-001.htm">content-counter-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -3959,7 +3959,7 @@
       <tr id="content-counter-002-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-002.htm">content-counter-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -3967,7 +3967,7 @@
       <tr id="content-counter-003-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-003.htm">content-counter-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -3975,7 +3975,7 @@
       <tr id="content-counter-004-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-004.htm">content-counter-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -3983,7 +3983,7 @@
       <tr id="content-counter-005-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-005.htm">content-counter-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -3991,7 +3991,7 @@
       <tr id="content-counter-006-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-006.htm">content-counter-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -3999,7 +3999,7 @@
       <tr id="content-counter-007-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-007.htm">content-counter-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -4007,7 +4007,7 @@
       <tr id="content-counter-008-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-008.htm">content-counter-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -4015,7 +4015,7 @@
       <tr id="content-counter-009-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-009.htm">content-counter-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -4023,7 +4023,7 @@
       <tr id="content-counter-010-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-010.htm">content-counter-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -4031,7 +4031,7 @@
       <tr id="content-counter-011-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-011.htm">content-counter-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -4039,7 +4039,7 @@
       <tr id="content-counter-012-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-012.htm">content-counter-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -4047,7 +4047,7 @@
       <tr id="content-counter-013-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-013.htm">content-counter-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -4055,7 +4055,7 @@
       <tr id="content-counter-014-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-014.htm">content-counter-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -4063,7 +4063,7 @@
       <tr id="content-counter-015-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-015.htm">content-counter-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -4071,7 +4071,7 @@
       <tr id="content-counter-016-12.2.#propdef-content" class="primary invalid">
         <td><strong>
             <a href="content-counter-016.htm">content-counter-016</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
@@ -8967,7 +8967,7 @@
       <tr id="content-counter-000-12.4.2" class="">
         <td>
             <a href="content-counter-000.htm">content-counter-000</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -8975,7 +8975,7 @@
       <tr id="content-counter-001-12.4.2" class="">
         <td>
             <a href="content-counter-001.htm">content-counter-001</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -8983,7 +8983,7 @@
       <tr id="content-counter-002-12.4.2" class="">
         <td>
             <a href="content-counter-002.htm">content-counter-002</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -8991,7 +8991,7 @@
       <tr id="content-counter-003-12.4.2" class="">
         <td>
             <a href="content-counter-003.htm">content-counter-003</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -8999,7 +8999,7 @@
       <tr id="content-counter-004-12.4.2" class="">
         <td>
             <a href="content-counter-004.htm">content-counter-004</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -9007,7 +9007,7 @@
       <tr id="content-counter-005-12.4.2" class="">
         <td>
             <a href="content-counter-005.htm">content-counter-005</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -9015,7 +9015,7 @@
       <tr id="content-counter-006-12.4.2" class="">
         <td>
             <a href="content-counter-006.htm">content-counter-006</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -9023,7 +9023,7 @@
       <tr id="content-counter-007-12.4.2" class="">
         <td>
             <a href="content-counter-007.htm">content-counter-007</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -9031,7 +9031,7 @@
       <tr id="content-counter-008-12.4.2" class="">
         <td>
             <a href="content-counter-008.htm">content-counter-008</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -9039,7 +9039,7 @@
       <tr id="content-counter-009-12.4.2" class="">
         <td>
             <a href="content-counter-009.htm">content-counter-009</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -9047,7 +9047,7 @@
       <tr id="content-counter-010-12.4.2" class="">
         <td>
             <a href="content-counter-010.htm">content-counter-010</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -9055,7 +9055,7 @@
       <tr id="content-counter-011-12.4.2" class="">
         <td>
             <a href="content-counter-011.htm">content-counter-011</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -9063,7 +9063,7 @@
       <tr id="content-counter-012-12.4.2" class="">
         <td>
             <a href="content-counter-012.htm">content-counter-012</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -9071,7 +9071,7 @@
       <tr id="content-counter-013-12.4.2" class="">
         <td>
             <a href="content-counter-013.htm">content-counter-013</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -9079,7 +9079,7 @@
       <tr id="content-counter-014-12.4.2" class="">
         <td>
             <a href="content-counter-014.htm">content-counter-014</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -9087,7 +9087,7 @@
       <tr id="content-counter-015-12.4.2" class="">
         <td>
             <a href="content-counter-015.htm">content-counter-015</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -9095,7 +9095,7 @@
       <tr id="content-counter-016-12.4.2" class="invalid">
         <td>
             <a href="content-counter-016.htm">content-counter-016</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-15.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-15.htm
index 1e9f55ff9da..fbdac7b1183 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-15.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-15.htm
@@ -627,7 +627,7 @@
       <tr id="font-family-invalid-characters-003-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-003.htm">font-family-invalid-characters-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -638,7 +638,7 @@
       <tr id="font-family-invalid-characters-004-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-004.htm">font-family-invalid-characters-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -649,7 +649,7 @@
       <tr id="font-family-invalid-characters-005-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-005.htm">font-family-invalid-characters-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -660,7 +660,7 @@
       <tr id="font-family-invalid-characters-006-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-006.htm">font-family-invalid-characters-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-16.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-16.htm
index e72d0dfa2ef..faa1faede64 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-16.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-16.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Text (608 tests)</h2>
+  <h2>Text (609 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -41,7 +41,7 @@
       <tr id="c547-indent-000-16.1" class="ahem">
         <td>
             <a href="c547-indent-000.htm">c547-indent-000</a></td>
-        <td></td>
+        <td><a href="reference/c547-indent-000-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text-indent
         </td>
@@ -9216,7 +9216,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s16.6.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/text.html#white-space-model">16.6.1 The 'white-space' processing model</a></th></tr>
-      <!-- 93 tests -->
+      <!-- 94 tests -->
       <tr id="bidi-001-16.6.1" class="">
         <td>
             <a href="bidi-001.htm">bidi-001</a></td>
@@ -9239,6 +9239,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-16.6.1" class="ahem may21">
+        <td>
+            <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="inlines-016-16.6.1" class="primary ahem">
         <td><strong>
             <a href="inlines-016.htm">inlines-016</a></strong></td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-18.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-18.htm
index 91939875546..890e2286c0e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-18.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-18.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>User interface (360 tests)</h2>
+  <h2>User interface (361 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="#s18.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/ui.html#cursor-props">18.1 Cursors: the 'cursor' property</a></th></tr>
-      <!-- 41 tests -->
+      <!-- 42 tests -->
       <tr id="cursor-001-18.1" class="image interact">
         <td>
             <a href="cursor-001.htm">cursor-001</a></td>
@@ -483,6 +483,17 @@
           </ul>
         </td>
       </tr>
+      <tr id="select-cursor-001-manual-18.1" class="HTMLonly interact">
+        <td>
+            <a href="select-cursor-001-manual.htm">select-cursor-001-manual</a></td>
+        <td></td>
+        <td><abbr class="interact" title="Requires user interaction">Interact</abbr></td>
+        <td>cursor property and select element
+          <ul class="assert">
+            <li>Hovering the pointer over a select menu on top of an element with a cursor set should not display said cursor</li>
+          </ul>
+        </td>
+      </tr>
     </tbody>
     <tbody id="s18.1.#propdef-cursor">
       <!-- 34 tests -->
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-4.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-4.htm
index e78c2a7c335..e73e23ca08d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-4.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-4.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Syntax and basic data types (439 tests)</h2>
+  <h2>Syntax and basic data types (438 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -35,7 +35,7 @@
       <tr id="counters-001-4" class="primary">
         <td><strong>
             <a href="counters-001.htm">counters-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-001-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counter functions with just the identifier
           <ul class="assert">
@@ -138,7 +138,7 @@
       <tr id="attribute-token-selector-002-4.1.1" class="primary">
         <td><strong>
             <a href="attribute-token-selector-002.htm">attribute-token-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/attribute-token-selector-002-ref.htm">=</a> </td>
         <td></td>
         <td>[attr~=&quot;&quot;]Attribute Selectors with Empty String Values
           <ul class="assert">
@@ -149,7 +149,7 @@
       <tr id="core-syntax-009-4.1.1" class="primary">
         <td><strong>
             <a href="core-syntax-009.htm">core-syntax-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Syntactic White Space
           <ul class="assert">
@@ -160,7 +160,7 @@
       <tr id="list-style-020-4.1.1" class="primary">
         <td><strong>
             <a href="list-style-020.htm">list-style-020</a></strong></td>
-        <td></td>
+        <td><a href="reference/list-style-020-ref.htm">=</a> </td>
         <td></td>
         <td>'list-style' shorthand and 'none' values
           <ul class="assert">
@@ -179,7 +179,7 @@
       <tr id="whitespace-001-4.1.1" class="primary">
         <td><strong>
             <a href="whitespace-001.htm">whitespace-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.htm">=</a> </td>
         <td></td>
         <td>White space - em-space (U+2003)
           <ul class="assert">
@@ -190,7 +190,7 @@
       <tr id="whitespace-002-4.1.1" class="primary">
         <td><strong>
             <a href="whitespace-002.htm">whitespace-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.htm">=</a> </td>
         <td></td>
         <td>White space - ideographic space (U+3000)
           <ul class="assert">
@@ -213,7 +213,7 @@
       <tr id="keywords-000-4.1.2" class="primary">
         <td><strong>
             <a href="keywords-000.htm">keywords-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Keywords v. Strings (background)
         </td>
@@ -221,7 +221,7 @@
       <tr id="keywords-001-4.1.2" class="primary">
         <td><strong>
             <a href="keywords-001.htm">keywords-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/keywords-001-ref.htm">=</a> </td>
         <td></td>
         <td>Keywords v. Strings (width)
         </td>
@@ -269,7 +269,7 @@
       <tr id="case-sensitive-000-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-000.htm">case-sensitive-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Case-sensitivity of Properties and Keywords (background)
         </td>
@@ -277,7 +277,7 @@
       <tr id="case-sensitive-001-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-001.htm">case-sensitive-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Case-sensitivity of At-rules (@media)
         </td>
@@ -285,7 +285,7 @@
       <tr id="case-sensitive-003-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-003.htm">case-sensitive-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-003-ref.htm">=</a> </td>
         <td></td>
         <td>Case-sensitivity of pseudo-classes and pseudo-elements
           <ul class="assert">
@@ -296,7 +296,7 @@
       <tr id="case-sensitive-004-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-004.htm">case-sensitive-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-003-ref.htm">=</a> </td>
         <td></td>
         <td>Case-sensitivity of :lang() arguments
           <ul class="assert">
@@ -307,7 +307,7 @@
       <tr id="case-sensitive-005-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-005.htm">case-sensitive-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-005-ref.htm">=</a> </td>
         <td></td>
         <td>Case-sensitivity of counter names
           <ul class="assert">
@@ -318,7 +318,7 @@
       <tr id="case-sensitive-006-4.1.3" class="primary HTMLonly">
         <td><strong>
             <a href="case-sensitive-006.htm">case-sensitive-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
         <td></td>
         <td>Case sensitivity with element selectors
           <ul class="assert">
@@ -472,7 +472,7 @@
       <tr id="escapes-000-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-000.htm">escapes-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/escapes-000-ref.htm">=</a> </td>
         <td></td>
         <td>Escaped Newline in String
         </td>
@@ -480,7 +480,7 @@
       <tr id="escapes-001-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-001.htm">escapes-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Escaped Quote Marks in String
         </td>
@@ -488,7 +488,7 @@
       <tr id="escapes-002-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-002.htm">escapes-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Invalid Punctuation Escapes
         </td>
@@ -496,7 +496,7 @@
       <tr id="escapes-003-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-003.htm">escapes-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Class and Keyword Letter Escapes
         </td>
@@ -504,7 +504,7 @@
       <tr id="escapes-004-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-004.htm">escapes-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Unicode Escapes
         </td>
@@ -512,7 +512,7 @@
       <tr id="escapes-005-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-005.htm">escapes-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Unicode Escapes and Case Insensitivity
         </td>
@@ -520,7 +520,7 @@
       <tr id="escapes-006-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-006.htm">escapes-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Incorrect Letter Escape (Class Selector)
         </td>
@@ -528,7 +528,7 @@
       <tr id="escapes-007-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-007.htm">escapes-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Space-terminated Unicode Escapes
         </td>
@@ -536,7 +536,7 @@
       <tr id="escapes-008-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-008.htm">escapes-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Space-terminated Character Escapes
         </td>
@@ -544,7 +544,7 @@
       <tr id="escapes-009-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-009.htm">escapes-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Characters and case: Escaping a character inside a keyword
           <ul class="assert">
@@ -555,7 +555,7 @@
       <tr id="escapes-010-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-010.htm">escapes-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unicode-escaped Braces
           <ul class="assert">
@@ -566,7 +566,7 @@
       <tr id="escapes-012-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-012.htm">escapes-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>CSS Parsing: Escaped keywords
         </td>
@@ -585,7 +585,7 @@
       <tr id="ident-000-4.1.3" class="primary">
         <td><strong>
             <a href="ident-000.htm">ident-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (a-z) as Classes and IDs
         </td>
@@ -593,7 +593,7 @@
       <tr id="ident-001-4.1.3" class="primary">
         <td><strong>
             <a href="ident-001.htm">ident-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs
         </td>
@@ -601,7 +601,7 @@
       <tr id="ident-002-4.1.3" class="primary">
         <td><strong>
             <a href="ident-002.htm">ident-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with _) as Classes and IDs
         </td>
@@ -609,7 +609,7 @@
       <tr id="ident-003-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-003.htm">ident-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Valid Identifiers (starting with -) as Classes and IDs
         </td>
@@ -617,7 +617,7 @@
       <tr id="ident-004-4.1.3" class="primary">
         <td><strong>
             <a href="ident-004.htm">ident-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with ideographic) as Classes and IDs
         </td>
@@ -625,7 +625,7 @@
       <tr id="ident-005-4.1.3" class="primary">
         <td><strong>
             <a href="ident-005.htm">ident-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including ideographic) as Classes and IDs
         </td>
@@ -633,7 +633,7 @@
       <tr id="ident-006-4.1.3" class="primary">
         <td><strong>
             <a href="ident-006.htm">ident-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escape) as Classes and IDs
         </td>
@@ -641,7 +641,7 @@
       <tr id="ident-007-4.1.3" class="primary">
         <td><strong>
             <a href="ident-007.htm">ident-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including escape) as Classes and IDs
         </td>
@@ -649,7 +649,7 @@
       <tr id="ident-008-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-008.htm">ident-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Identifiers (starting with digit) as Classes and IDs
         </td>
@@ -657,7 +657,7 @@
       <tr id="ident-009-4.1.3" class="primary">
         <td><strong>
             <a href="ident-009.htm">ident-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including digits) as Classes and IDs
         </td>
@@ -665,7 +665,7 @@
       <tr id="ident-010-4.1.3" class="primary">
         <td><strong>
             <a href="ident-010.htm">ident-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escape) as Classes and IDs
         </td>
@@ -673,7 +673,7 @@
       <tr id="ident-011-4.1.3" class="primary">
         <td><strong>
             <a href="ident-011.htm">ident-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including escapes) as Classes and IDs
         </td>
@@ -681,7 +681,7 @@
       <tr id="ident-012-4.1.3" class="primary">
         <td><strong>
             <a href="ident-012.htm">ident-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-012-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs
         </td>
@@ -689,7 +689,7 @@
       <tr id="ident-013-4.1.3" class="primary">
         <td><strong>
             <a href="ident-013.htm">ident-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escaped -) as Classes and IDs
         </td>
@@ -697,7 +697,7 @@
       <tr id="ident-020-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-020.htm">ident-020</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Identifiers (starting with double -) as Classes and IDs
         </td>
@@ -735,7 +735,7 @@
       <tr id="at-import-009-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-009.htm">at-import-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following a known but invalid @rule
           <ul class="assert">
@@ -746,7 +746,7 @@
       <tr id="at-import-010-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-010.htm">at-import-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following an invalid selector
           <ul class="assert">
@@ -757,7 +757,7 @@
       <tr id="at-import-011-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-011.htm">at-import-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following garbage
           <ul class="assert">
@@ -768,7 +768,7 @@
       <tr id="at-keywords-000-4.1.5" class="primary">
         <td><strong>
             <a href="at-keywords-000.htm">at-keywords-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -776,7 +776,7 @@
       <tr id="at-keywords-001-4.1.5" class="primary">
         <td><strong>
             <a href="at-keywords-001.htm">at-keywords-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -784,7 +784,7 @@
       <tr id="at-keywords-002-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-keywords-002.htm">at-keywords-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -792,7 +792,7 @@
       <tr id="at-rules-000-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-rules-000.htm">at-rules-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -800,7 +800,7 @@
       <tr id="at-rules-001-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-001.htm">at-rules-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -808,7 +808,7 @@
       <tr id="at-rules-002-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-002.htm">at-rules-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -816,7 +816,7 @@
       <tr id="at-rules-003-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-003.htm">at-rules-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -824,7 +824,7 @@
       <tr id="at-rules-004-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-004.htm">at-rules-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -832,7 +832,7 @@
       <tr id="import-000-4.1.5" class="primary invalid">
         <td><strong>
             <a href="import-000.htm">import-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -840,7 +840,7 @@
       <tr id="import-001-4.1.5" class="primary invalid">
         <td><strong>
             <a href="import-001.htm">import-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -863,7 +863,7 @@
       <tr id="blocks-001-4.1.6" class="primary invalid">
         <td><strong>
             <a href="blocks-001.htm">blocks-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/blocks-001-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Parsing nested blocks and strings in style blocks
           <ul class="assert">
@@ -963,7 +963,7 @@
       <tr id="escapes-011-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-011.htm">escapes-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>CSS Parsing: Escaped keywords
         </td>
@@ -971,7 +971,7 @@
       <tr id="escapes-013-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-013.htm">escapes-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/escapes-013-ref.htm">=</a> </td>
         <td></td>
         <td>Escaping and spaces with classes
         </td>
@@ -979,7 +979,7 @@
       <tr id="escapes-014-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-014.htm">escapes-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Escaping and spaces with declarations
         </td>
@@ -1276,7 +1276,7 @@
       <tr id="sgml-comments-000-4.1.9" class="primary">
         <td><strong>
             <a href="sgml-comments-000.htm">sgml-comments-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>SGML comments
           <ul class="assert">
@@ -1298,7 +1298,7 @@
       <tr id="sgml-comments-002-4.1.9" class="primary">
         <td><strong>
             <a href="sgml-comments-002.htm">sgml-comments-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/sgml-comments-002-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing of CDO/CDC in stylesheets
         </td>
@@ -1447,7 +1447,7 @@
       <tr id="at-rule-013-4.2" class="primary invalid">
         <td><strong>
             <a href="at-rule-013.htm">at-rule-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/at-rule-013-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside @media blocks
           <ul class="assert">
@@ -1517,7 +1517,7 @@
       <tr id="core-syntax-001-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-001.htm">core-syntax-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-001-ref.htm">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places
         </td>
@@ -1525,7 +1525,7 @@
       <tr id="core-syntax-002-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-002.htm">core-syntax-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-002-ref.htm">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places
         </td>
@@ -1533,7 +1533,7 @@
       <tr id="core-syntax-003-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-003.htm">core-syntax-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places (with no whitespace)
         </td>
@@ -1541,7 +1541,7 @@
       <tr id="core-syntax-004-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-004.htm">core-syntax-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places (with no whitespace)
         </td>
@@ -1549,7 +1549,7 @@
       <tr id="core-syntax-006-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-006.htm">core-syntax-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-006-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1557,7 +1557,7 @@
       <tr id="core-syntax-007-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-007.htm">core-syntax-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-007-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1565,7 +1565,7 @@
       <tr id="core-syntax-008-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-008.htm">core-syntax-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1573,7 +1573,7 @@
       <tr id="counters-003-4.2" class="primary">
         <td><strong>
             <a href="counters-003.htm">counters-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counter() function with no white space
           <ul class="assert">
@@ -1584,7 +1584,7 @@
       <tr id="counters-004-4.2" class="primary">
         <td><strong>
             <a href="counters-004.htm">counters-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counters() function with no white space and two function values
           <ul class="assert">
@@ -1595,7 +1595,7 @@
       <tr id="counters-005-4.2" class="primary">
         <td><strong>
             <a href="counters-005.htm">counters-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counters() function with no white space and three function values
           <ul class="assert">
@@ -1606,7 +1606,7 @@
       <tr id="counters-006-4.2" class="primary">
         <td><strong>
             <a href="counters-006.htm">counters-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counter() function with white space
           <ul class="assert">
@@ -1617,7 +1617,7 @@
       <tr id="counters-007-4.2" class="primary">
         <td><strong>
             <a href="counters-007.htm">counters-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counter() function with white space and two function values
           <ul class="assert">
@@ -1628,7 +1628,7 @@
       <tr id="counters-008-4.2" class="primary">
         <td><strong>
             <a href="counters-008.htm">counters-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counters() function with white space and two function values
           <ul class="assert">
@@ -1639,7 +1639,7 @@
       <tr id="counters-009-4.2" class="primary">
         <td><strong>
             <a href="counters-009.htm">counters-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counters() function with white space and three function values
           <ul class="assert">
@@ -1650,7 +1650,7 @@
       <tr id="counters-010-4.2" class="primary">
         <td><strong>
             <a href="counters-010.htm">counters-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-010-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing counters() functions
           <ul class="assert">
@@ -1672,7 +1672,7 @@
       <tr id="declaration-001-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-001.htm">declaration-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing ':', value, part 1
         </td>
@@ -1680,7 +1680,7 @@
       <tr id="declaration-002-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-002.htm">declaration-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing ':', value, part 2
         </td>
@@ -1688,7 +1688,7 @@
       <tr id="declaration-003-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-003.htm">declaration-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing value, part 1
         </td>
@@ -1696,7 +1696,7 @@
       <tr id="declaration-004-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-004.htm">declaration-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing value, part 2
         </td>
@@ -1704,7 +1704,7 @@
       <tr id="declaration-005-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-005.htm">declaration-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration: unexpected tokens { }, part 1
         </td>
@@ -1712,7 +1712,7 @@
       <tr id="declaration-006-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-006.htm">declaration-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration: unexpected tokens { }, part 2
         </td>
@@ -1720,7 +1720,7 @@
       <tr id="declarations-009-4.2" class="primary invalid">
         <td><strong>
             <a href="declarations-009.htm">declarations-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/declarations-009-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside declaration blocks
           <ul class="assert">
@@ -1830,7 +1830,7 @@
       <tr id="font-family-invalid-characters-003-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-003.htm">font-family-invalid-characters-003</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -1841,7 +1841,7 @@
       <tr id="font-family-invalid-characters-004-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-004.htm">font-family-invalid-characters-004</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -1852,7 +1852,7 @@
       <tr id="font-family-invalid-characters-005-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-005.htm">font-family-invalid-characters-005</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -1863,7 +1863,7 @@
       <tr id="font-family-invalid-characters-006-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-006.htm">font-family-invalid-characters-006</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
@@ -1995,7 +1995,7 @@
       <tr id="matching-brackets-001-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-001.htm">matching-brackets-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for @rules
           <ul class="assert">
@@ -2006,7 +2006,7 @@
       <tr id="matching-brackets-002-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-002.htm">matching-brackets-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-002-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for declarations
           <ul class="assert">
@@ -2017,7 +2017,7 @@
       <tr id="matching-brackets-003-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-003.htm">matching-brackets-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for selectors
           <ul class="assert">
@@ -2036,7 +2036,7 @@
       <tr id="selectors-parsing-001-4.2" class="primary">
         <td><strong>
             <a href="selectors-parsing-001.htm">selectors-parsing-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/selectors-parsing-001-ref.htm">=</a> </td>
         <td></td>
         <td>CSS: Selector Parsing and Invalid Pseudo-Elements
         </td>
@@ -2044,7 +2044,7 @@
       <tr id="unterminated-string-001-4.2" class="primary invalid">
         <td><strong>
             <a href="unterminated-string-001.htm">unterminated-string-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Error handling of unterminated strings
           <ul class="assert">
@@ -2063,7 +2063,7 @@
       <tr id="uri-017-4.2" class="primary image invalid">
         <td><strong>
             <a href="uri-017.htm">uri-017</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-017-ref.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unclosed URI Token at EOF (in declaration)
           <ul class="assert">
@@ -2074,7 +2074,7 @@
       <tr id="uri-018-4.2" class="primary image invalid">
         <td><strong>
             <a href="uri-018.htm">uri-018</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unclosed URI Token at EOF (in @import)
           <ul class="assert">
@@ -2150,7 +2150,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.3.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/syndata.html#numbers">4.3.1 Integers and real numbers</a></th></tr>
-      <!-- 10 tests -->
+      <!-- 9 tests -->
       <tr id="numbers-units-001-4.3.1" class="primary invalid">
         <td><strong>
             <a href="numbers-units-001.htm">numbers-units-001</a></strong></td>
@@ -2187,7 +2187,7 @@
       <tr id="numbers-units-004-4.3.1" class="primary">
         <td><strong>
             <a href="numbers-units-004.htm">numbers-units-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-filled-black-96px-square.htm">=</a> </td>
         <td></td>
         <td>Parsing integer numbers with '+'
           <ul class="assert">
@@ -2195,17 +2195,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="positive-integer-001-4.3.1" class="primary">
-        <td><strong>
-            <a href="positive-integer-001.htm">positive-integer-001</a></strong></td>
-        <td></td>
-        <td></td>
-        <td>Parsing signed integers
-          <ul class="assert">
-            <li>Positively signed integers are treated the same as non-signed integers.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="z-index-015-4.3.1" class="invalid">
         <td>
             <a href="z-index-015.htm">z-index-015</a></td>
@@ -2314,7 +2303,7 @@
       <tr id="c547-indent-000-4.3.2" class="ahem">
         <td>
             <a href="c547-indent-000.htm">c547-indent-000</a></td>
-        <td></td>
+        <td><a href="reference/c547-indent-000-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text-indent
         </td>
@@ -2338,7 +2327,7 @@
       <tr id="c5510-padn-000-4.3.2" class="ahem image">
         <td>
             <a href="c5510-padn-000.htm">c5510-padn-000</a></td>
-        <td></td>
+        <td><a href="reference/c5510-padn-000-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>padding
         </td>
@@ -2406,7 +2395,7 @@
       <tr id="numbers-units-006-4.3.2" class="primary invalid">
         <td><strong>
             <a href="numbers-units-006.htm">numbers-units-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-filled-black-96px-square.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unsupported negative values
           <ul class="assert">
@@ -2417,7 +2406,7 @@
       <tr id="numbers-units-007-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-007.htm">numbers-units-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-007-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em sizes
           <ul class="assert">
@@ -2428,7 +2417,7 @@
       <tr id="numbers-units-009-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-009.htm">numbers-units-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-009-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with the font-size set to px size
           <ul class="assert">
@@ -2439,7 +2428,7 @@
       <tr id="numbers-units-010-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-010.htm">numbers-units-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-010-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to inch
           <ul class="assert">
@@ -2450,7 +2439,7 @@
       <tr id="numbers-units-011-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-011.htm">numbers-units-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-011-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to em
           <ul class="assert">
@@ -2461,7 +2450,7 @@
       <tr id="numbers-units-012-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-012.htm">numbers-units-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-012-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to ex
           <ul class="assert">
@@ -2472,7 +2461,7 @@
       <tr id="numbers-units-013-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-013.htm">numbers-units-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-013-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to percentage
           <ul class="assert">
@@ -2483,7 +2472,7 @@
       <tr id="numbers-units-015-4.3.2" class="primary ahem should">
         <td><strong>
             <a href="numbers-units-015.htm">numbers-units-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-014-ref-a.htm">=</a> <a href="reference/numbers-units-014-ref-b.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="should" title="Behavior tested is recommended but not required">Recommend</abbr></td>
         <td>Height of EX
           <ul class="assert">
@@ -2494,7 +2483,7 @@
       <tr id="numbers-units-018-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-018.htm">numbers-units-018</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-018-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Specifying em/ex on the root element
           <ul class="assert">
@@ -2505,7 +2494,7 @@
       <tr id="numbers-units-019-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-019.htm">numbers-units-019</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-019-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>First available font defines the 'ex' unit size
           <ul class="assert">
@@ -2516,7 +2505,7 @@
       <tr id="numbers-units-021-4.3.2" class="primary 96dpi ahem">
         <td><strong>
             <a href="numbers-units-021.htm">numbers-units-021</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-021-ref.htm">=</a> </td>
         <td><abbr class="96dpi" title="Only valid on 96dpi displays">96</abbr><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Root element and the 'em' unit size
           <ul class="assert">
@@ -2589,7 +2578,7 @@
       <tr id="units-005-4.3.2" class="primary">
         <td><strong>
             <a href="units-005.htm">units-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/units-005-ref.htm">=</a> </td>
         <td></td>
         <td>Units: em (0.87em floats)
         </td>
@@ -2745,7 +2734,7 @@
       <tr id="uri-004-4.3.4" class="primary image">
         <td><strong>
             <a href="uri-004.htm">uri-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>URL function with URI that has escaped special chars
           <ul class="assert">
@@ -2756,7 +2745,7 @@
       <tr id="uri-005-4.3.4" class="primary image">
         <td><strong>
             <a href="uri-005.htm">uri-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>URL function with escaped special chars - single quote
           <ul class="assert">
@@ -2833,7 +2822,7 @@
       <tr id="uri-012-4.3.4" class="primary invalid">
         <td><strong>
             <a href="uri-012.htm">uri-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-012-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Error handling of broken url() - balancing braces
         </td>
@@ -2841,7 +2830,7 @@
       <tr id="uri-014-4.3.4" class="primary">
         <td><strong>
             <a href="uri-014.htm">uri-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Unquoted commas in url()
           <ul class="assert">
@@ -2852,7 +2841,7 @@
       <tr id="uri-015-4.3.4" class="primary">
         <td><strong>
             <a href="uri-015.htm">uri-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td></td>
         <td>Escaped url() functional notation
           <ul class="assert">
@@ -2863,7 +2852,7 @@
       <tr id="uri-016-4.3.4" class="primary">
         <td><strong>
             <a href="uri-016.htm">uri-016</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-016-ref.htm">=</a> </td>
         <td></td>
         <td>Error handling of broken url() with open /*
           <ul class="assert">
@@ -2883,7 +2872,7 @@
       <tr id="content-counter-000-4.3.5" class="">
         <td>
             <a href="content-counter-000.htm">content-counter-000</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -2891,7 +2880,7 @@
       <tr id="content-counter-001-4.3.5" class="">
         <td>
             <a href="content-counter-001.htm">content-counter-001</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -2899,7 +2888,7 @@
       <tr id="content-counter-002-4.3.5" class="">
         <td>
             <a href="content-counter-002.htm">content-counter-002</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -2907,7 +2896,7 @@
       <tr id="content-counter-003-4.3.5" class="">
         <td>
             <a href="content-counter-003.htm">content-counter-003</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -2915,7 +2904,7 @@
       <tr id="content-counter-004-4.3.5" class="">
         <td>
             <a href="content-counter-004.htm">content-counter-004</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -2923,7 +2912,7 @@
       <tr id="content-counter-005-4.3.5" class="">
         <td>
             <a href="content-counter-005.htm">content-counter-005</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -2931,7 +2920,7 @@
       <tr id="content-counter-006-4.3.5" class="">
         <td>
             <a href="content-counter-006.htm">content-counter-006</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -2939,7 +2928,7 @@
       <tr id="content-counter-007-4.3.5" class="">
         <td>
             <a href="content-counter-007.htm">content-counter-007</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -2947,7 +2936,7 @@
       <tr id="content-counter-008-4.3.5" class="">
         <td>
             <a href="content-counter-008.htm">content-counter-008</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -2955,7 +2944,7 @@
       <tr id="content-counter-009-4.3.5" class="">
         <td>
             <a href="content-counter-009.htm">content-counter-009</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -2963,7 +2952,7 @@
       <tr id="content-counter-010-4.3.5" class="">
         <td>
             <a href="content-counter-010.htm">content-counter-010</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -2971,7 +2960,7 @@
       <tr id="content-counter-011-4.3.5" class="">
         <td>
             <a href="content-counter-011.htm">content-counter-011</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -2979,7 +2968,7 @@
       <tr id="content-counter-012-4.3.5" class="">
         <td>
             <a href="content-counter-012.htm">content-counter-012</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -2987,7 +2976,7 @@
       <tr id="content-counter-013-4.3.5" class="">
         <td>
             <a href="content-counter-013.htm">content-counter-013</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -2995,7 +2984,7 @@
       <tr id="content-counter-014-4.3.5" class="">
         <td>
             <a href="content-counter-014.htm">content-counter-014</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -3003,7 +2992,7 @@
       <tr id="content-counter-015-4.3.5" class="">
         <td>
             <a href="content-counter-015.htm">content-counter-015</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.htm">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -3011,7 +3000,7 @@
       <tr id="content-counter-016-4.3.5" class="invalid">
         <td>
             <a href="content-counter-016.htm">content-counter-016</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
@@ -3367,7 +3356,7 @@
       <tr id="color-000-4.3.6" class="primary invalid">
         <td><strong>
             <a href="color-000.htm">color-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/color-000-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>RGB color syntax error handling
         </td>
@@ -3430,7 +3419,7 @@
       <tr id="colors-006-4.3.6" class="primary">
         <td><strong>
             <a href="colors-006.htm">colors-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/colors-006-ref.htm">=</a> </td>
         <td></td>
         <td>Comparing color keywords and hex values
           <ul class="assert">
@@ -3461,7 +3450,7 @@
       <tr id="escaped-newline-001-4.3.7" class="primary">
         <td><strong>
             <a href="escaped-newline-001.htm">escaped-newline-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/escaped-newline-001-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing strings with escaped newlines
           <ul class="assert">
@@ -3472,7 +3461,7 @@
       <tr id="quoted-string-001-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-001.htm">quoted-string-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-001-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing of single quotes inside double quotes
           <ul class="assert">
@@ -3483,7 +3472,7 @@
       <tr id="quoted-string-002-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-002.htm">quoted-string-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-002-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing of double quotes inside single quotes
           <ul class="assert">
@@ -3494,7 +3483,7 @@
       <tr id="quoted-string-003-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-003.htm">quoted-string-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-001-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing of escaped quotes (single within single)
           <ul class="assert">
@@ -3505,7 +3494,7 @@
       <tr id="quoted-string-004-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-004.htm">quoted-string-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-002-ref.htm">=</a> </td>
         <td></td>
         <td>Parsing of escaped double quotes
           <ul class="assert">
@@ -3516,7 +3505,7 @@
       <tr id="strings-000-4.3.7" class="primary">
         <td><strong>
             <a href="strings-000.htm">strings-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Newlines in strings
         </td>
@@ -3542,7 +3531,7 @@
       <tr id="at-charset-001-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-001.htm">at-charset-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP Charset vs BOM
           <ul class="assert">
@@ -3553,7 +3542,7 @@
       <tr id="at-charset-002-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-002.htm">at-charset-002</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP Charset over @charset
           <ul class="assert">
@@ -3564,7 +3553,7 @@
       <tr id="at-charset-003-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-003.htm">at-charset-003</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over link charset
           <ul class="assert">
@@ -3575,7 +3564,7 @@
       <tr id="at-charset-004-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-004.htm">at-charset-004</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over set referring code page (UTF-8)
           <ul class="assert">
@@ -3586,7 +3575,7 @@
       <tr id="at-charset-005-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-005.htm">at-charset-005</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over set referring code page (windows-1252)
           <ul class="assert">
@@ -3597,7 +3586,7 @@
       <tr id="at-charset-006-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-006.htm">at-charset-006</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over referring code page (not set)
           <ul class="assert">
@@ -3608,7 +3597,7 @@
       <tr id="at-charset-007-4.4" class="primary">
         <td><strong>
             <a href="at-charset-007.htm">at-charset-007</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset over link charset attribute
           <ul class="assert">
@@ -3619,7 +3608,7 @@
       <tr id="at-charset-008-4.4" class="primary">
         <td><strong>
             <a href="at-charset-008.htm">at-charset-008</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset over referring document's code page (set)
           <ul class="assert">
@@ -3630,7 +3619,7 @@
       <tr id="at-charset-009-4.4" class="primary">
         <td><strong>
             <a href="at-charset-009.htm">at-charset-009</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset over referring document's code page (unset)
           <ul class="assert">
@@ -3641,7 +3630,7 @@
       <tr id="at-charset-010-4.4" class="primary">
         <td><strong>
             <a href="at-charset-010.htm">at-charset-010</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Link charset attribute over referring document's codepage (set)
           <ul class="assert">
@@ -3652,7 +3641,7 @@
       <tr id="at-charset-011-4.4" class="primary">
         <td><strong>
             <a href="at-charset-011.htm">at-charset-011</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Link charset attribute over referring document's codepage (not set)
           <ul class="assert">
@@ -3663,7 +3652,7 @@
       <tr id="at-charset-012-4.4" class="primary">
         <td><strong>
             <a href="at-charset-012.htm">at-charset-012</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Stylesheet encoding via the referring document's encoding (set)
           <ul class="assert">
@@ -3685,7 +3674,7 @@
       <tr id="at-charset-014-4.4" class="primary">
         <td><strong>
             <a href="at-charset-014.htm">at-charset-014</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-8)
           <ul class="assert">
@@ -3696,7 +3685,7 @@
       <tr id="at-charset-015-4.4" class="primary">
         <td><strong>
             <a href="at-charset-015.htm">at-charset-015</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-16 LE)
           <ul class="assert">
@@ -3707,7 +3696,7 @@
       <tr id="at-charset-016-4.4" class="primary">
         <td><strong>
             <a href="at-charset-016.htm">at-charset-016</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-16 BE)
           <ul class="assert">
@@ -3718,7 +3707,7 @@
       <tr id="at-charset-019-4.4" class="primary">
         <td><strong>
             <a href="at-charset-019.htm">at-charset-019</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-8)
           <ul class="assert">
@@ -3729,7 +3718,7 @@
       <tr id="at-charset-020-4.4" class="primary">
         <td><strong>
             <a href="at-charset-020.htm">at-charset-020</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-16LE)
           <ul class="assert">
@@ -3740,7 +3729,7 @@
       <tr id="at-charset-021-4.4" class="primary">
         <td><strong>
             <a href="at-charset-021.htm">at-charset-021</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-16BE)
           <ul class="assert">
@@ -3751,7 +3740,7 @@
       <tr id="at-charset-024-4.4" class="primary">
         <td><strong>
             <a href="at-charset-024.htm">at-charset-024</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (windows-1252)
           <ul class="assert">
@@ -3762,7 +3751,7 @@
       <tr id="at-charset-025-4.4" class="primary">
         <td><strong>
             <a href="at-charset-025.htm">at-charset-025</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (Shift-JIS)
           <ul class="assert">
@@ -3773,7 +3762,7 @@
       <tr id="at-charset-026-4.4" class="primary">
         <td><strong>
             <a href="at-charset-026.htm">at-charset-026</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (ISO-8859-6)
           <ul class="assert">
@@ -3784,7 +3773,7 @@
       <tr id="at-charset-027-4.4" class="primary">
         <td><strong>
             <a href="at-charset-027.htm">at-charset-027</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (Big5)
           <ul class="assert">
@@ -3795,7 +3784,7 @@
       <tr id="at-charset-028-4.4" class="primary">
         <td><strong>
             <a href="at-charset-028.htm">at-charset-028</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-8)
           <ul class="assert">
@@ -3806,7 +3795,7 @@
       <tr id="at-charset-029-4.4" class="primary">
         <td><strong>
             <a href="at-charset-029.htm">at-charset-029</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-16LE)
           <ul class="assert">
@@ -3817,7 +3806,7 @@
       <tr id="at-charset-030-4.4" class="primary">
         <td><strong>
             <a href="at-charset-030.htm">at-charset-030</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-16BE)
           <ul class="assert">
@@ -3905,7 +3894,7 @@
       <tr id="at-charset-040-4.4" class="primary">
         <td><strong>
             <a href="at-charset-040.htm">at-charset-040</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Non-matching @charset (UTF-16BE with UTF-8 @charset)
           <ul class="assert">
@@ -3916,7 +3905,7 @@
       <tr id="at-charset-041-4.4" class="primary">
         <td><strong>
             <a href="at-charset-041.htm">at-charset-041</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Non-matching @charset (UTF-32LE with UTF-16BE @charset)
           <ul class="assert">
@@ -3927,7 +3916,7 @@
       <tr id="at-charset-042-4.4" class="primary">
         <td><strong>
             <a href="at-charset-042.htm">at-charset-042</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3938,7 +3927,7 @@
       <tr id="at-charset-043-4.4" class="primary">
         <td><strong>
             <a href="at-charset-043.htm">at-charset-043</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)
           <ul class="assert">
@@ -3949,7 +3938,7 @@
       <tr id="at-charset-044-4.4" class="primary">
         <td><strong>
             <a href="at-charset-044.htm">at-charset-044</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3960,7 +3949,7 @@
       <tr id="at-charset-045-4.4" class="primary">
         <td><strong>
             <a href="at-charset-045.htm">at-charset-045</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3971,7 +3960,7 @@
       <tr id="at-charset-046-4.4" class="primary">
         <td><strong>
             <a href="at-charset-046.htm">at-charset-046</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)
           <ul class="assert">
@@ -3982,7 +3971,7 @@
       <tr id="at-charset-047-4.4" class="primary">
         <td><strong>
             <a href="at-charset-047.htm">at-charset-047</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Endianness not specified (UTF-16LE encoding with UTF-16 @charset)
           <ul class="assert">
@@ -3993,7 +3982,7 @@
       <tr id="at-charset-048-4.4" class="primary">
         <td><strong>
             <a href="at-charset-048.htm">at-charset-048</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>Endianness not specified (UTF-16BE encoding with UTF-16 @charset)
           <ul class="assert">
@@ -4059,7 +4048,7 @@
       <tr id="at-charset-054-4.4" class="primary">
         <td><strong>
             <a href="at-charset-054.htm">at-charset-054</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
         <td></td>
         <td>@charset in uppercase
           <ul class="assert">
@@ -4081,7 +4070,7 @@
       <tr id="at-charset-056-4.4" class="primary">
         <td><strong>
             <a href="at-charset-056.htm">at-charset-056</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
         <td></td>
         <td>@charset missing a space
           <ul class="assert">
@@ -4125,7 +4114,7 @@
       <tr id="at-charset-060-4.4" class="primary">
         <td><strong>
             <a href="at-charset-060.htm">at-charset-060</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
         <td></td>
         <td>@charset with bogus name
           <ul class="assert">
@@ -4136,7 +4125,7 @@
       <tr id="at-charset-061-4.4" class="primary">
         <td><strong>
             <a href="at-charset-061.htm">at-charset-061</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
         <td></td>
         <td>@charset within style block
           <ul class="assert">
@@ -4147,7 +4136,7 @@
       <tr id="at-charset-071-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-071.htm">at-charset-071</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-1
         </td>
@@ -4155,7 +4144,7 @@
       <tr id="at-charset-072-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-072.htm">at-charset-072</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-11
         </td>
@@ -4163,7 +4152,7 @@
       <tr id="at-charset-073-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-073.htm">at-charset-073</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-5
         </td>
@@ -4171,7 +4160,7 @@
       <tr id="at-charset-074-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-074.htm">at-charset-074</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-6
         </td>
@@ -4179,7 +4168,7 @@
       <tr id="at-charset-075-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-075.htm">at-charset-075</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-7
         </td>
@@ -4187,7 +4176,7 @@
       <tr id="at-charset-076-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-076.htm">at-charset-076</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-8
         </td>
@@ -4195,7 +4184,7 @@
       <tr id="at-charset-077-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-077.htm">at-charset-077</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: KOI8-R
         </td>
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 1b515e58925..fecfc3f1825 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
@@ -35,7 +35,7 @@
       <tr id="cascade-import-dynamic-001-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-001.htm">cascade-import-dynamic-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Dynamic sheet append (&lt;style&gt;)
         </td>
@@ -43,7 +43,7 @@
       <tr id="cascade-import-dynamic-002-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-002.htm">cascade-import-dynamic-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Dynamic sheet append (&lt;link&gt;)
         </td>
@@ -51,7 +51,7 @@
       <tr id="cascade-import-dynamic-003-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-003.htm">cascade-import-dynamic-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Dynamic sheet insertion (&lt;style&gt;)
         </td>
@@ -59,7 +59,7 @@
       <tr id="cascade-import-dynamic-004-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-004.htm">cascade-import-dynamic-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Dynamic sheet insertion (&lt;link&gt;)
         </td>
@@ -67,7 +67,7 @@
       <tr id="cascade-import-dynamic-005-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-005.htm">cascade-import-dynamic-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Dynamic sheet deletion (&lt;style&gt;)
         </td>
@@ -75,7 +75,7 @@
       <tr id="cascade-import-dynamic-006-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-006.htm">cascade-import-dynamic-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Dynamic sheet deletion (&lt;link&gt;)
         </td>
@@ -83,7 +83,7 @@
       <tr id="cascade-import-dynamic-control-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-control.htm">cascade-import-dynamic-control</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Control test
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-7.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-7.htm
index 9d8dd28f22d..ffc3a1d3e5b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-7.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-7.htm
@@ -246,7 +246,7 @@
       <tr id="at-rule-013-7.2.1" class="invalid">
         <td>
             <a href="at-rule-013.htm">at-rule-013</a></td>
-        <td></td>
+        <td><a href="reference/at-rule-013-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside @media blocks
           <ul class="assert">
@@ -257,7 +257,7 @@
       <tr id="matching-brackets-001-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-001.htm">matching-brackets-001</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for @rules
           <ul class="assert">
@@ -268,7 +268,7 @@
       <tr id="matching-brackets-002-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-002.htm">matching-brackets-002</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-002-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for declarations
           <ul class="assert">
@@ -279,7 +279,7 @@
       <tr id="matching-brackets-003-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-003.htm">matching-brackets-003</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.htm">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for selectors
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/html4/chapter-8.htm b/tests/wpt/css-tests/css21_dev/html4/chapter-8.htm
index 7bbae507287..e1b29f100e6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-8.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-8.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Box model (2326 tests)</h2>
+  <h2>Box model (2327 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -8363,7 +8363,7 @@
       <tr id="c5510-padn-000-8.4" class="ahem image">
         <td>
             <a href="c5510-padn-000.htm">c5510-padn-000</a></td>
-        <td></td>
+        <td><a href="reference/c5510-padn-000-ref.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>padding
         </td>
@@ -45568,7 +45568,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s8.6">+</a>
         <a href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model">8.6 The box model for inline elements in bidirectional context</a></th></tr>
-      <!-- 80 tests -->
+      <!-- 81 tests -->
       <tr id="bidi-001-8.6" class="">
         <td>
             <a href="bidi-001.htm">bidi-001</a></td>
@@ -45602,6 +45602,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-8.6" class="ahem may21">
+        <td>
+            <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-8.6" class="">
         <td>
             <a href="bidi-005.htm">bidi-005</a></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 0b54bdd2f60..6974a97301b 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 (1245 tests)</h2>
+  <h2>Visual formatting model (1246 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -17418,7 +17418,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s9.10">+</a>
         <a href="http://www.w3.org/TR/CSS21/visuren.html#direction">9.10 Text direction: the 'direction' and 'unicode-bidi' properties</a></th></tr>
-      <!-- 118 tests -->
+      <!-- 119 tests -->
       <tr id="bidi-001-9.10" class="">
         <td>
             <a href="bidi-001.htm">bidi-001</a></td>
@@ -17452,6 +17452,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-9.10" class="ahem may21">
+        <td>
+            <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-9.10" class="">
         <td>
             <a href="bidi-005.htm">bidi-005</a></td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/color-000.htm b/tests/wpt/css-tests/css21_dev/html4/color-000.htm
index c05e938a41d..f24dcb54646 100644
--- a/tests/wpt/css-tests/css21_dev/html4/color-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/color-000.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/006.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#color-units">
+  <link rel="match" href="reference/color-000-ref.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p.correct { color: red }
diff --git a/tests/wpt/css-tests/css21_dev/html4/colors-006.htm b/tests/wpt/css-tests/css21_dev/html4/colors-006.htm
index d1d5f0bcfd4..384e8d2336e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/colors-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/colors-006.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Comparing color keywords and hex values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#color-units">
+        <link rel="match" href="reference/colors-006-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Color matching of keywords and hex values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-000.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-000.htm
index 8e666f51b52..27f0e289a12 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-000.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-000-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-001.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-001.htm
index e987acc6e21..7f04496c9f8 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-001.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-001-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-002.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-002.htm
index ef0a01c337c..ab5be7c62f8 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-002.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-002-ref.htm">
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-003.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-003.htm
index 45416ab15d5..416256ef141 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-003.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-003-ref.htm">
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-004.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-004.htm
index 5708b62a49f..ffc600264a7 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-004.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-004-ref.htm">
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-005.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-005.htm
index ce721286ee3..9f1720861b2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-005.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-000-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-006.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-006.htm
index 763909737c9..ee3c0623cb9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-006.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-006-ref.htm">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-007.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-007.htm
index 36f6b7a22f7..6f7463a255d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-007.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-007-ref.htm">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-008.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-008.htm
index dc3e56e0575..e13bb723a2f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-008.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-008-ref.htm">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-009.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-009.htm
index 5965cd640b4..a05c89fe622 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-009.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-009-ref.htm">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-010.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-010.htm
index a5dedbd6e5f..551da2aec43 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-010.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-010-ref.htm">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-011.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-011.htm
index bc3daaf5258..f9f0ee09f5d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-011.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-011.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-011-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-012.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-012.htm
index 6020ea7e6f3..70e9cd72f78 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-012.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-012.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-011-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-013.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-013.htm
index 5691eb59d67..f78ee1aa9e1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-013.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-013.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-013-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-014.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-014.htm
index a2bd947999b..dd3cdf5b553 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-014.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-014.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-013-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-015.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-015.htm
index 8475c68f997..58f465ecfc2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-015.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-015.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-015-ref.htm">
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counter-016.htm b/tests/wpt/css-tests/css21_dev/html4/content-counter-016.htm
index 798e08f7692..7ed361b6b62 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counter-016.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counter-016.htm
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles">
+  <link rel="match" href="reference/content-counter-000-ref.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
 
@@ -20,7 +21,6 @@
     content: counter(f, ".", decimal);
     content: counter(f, decimal, ".");
     content: counter(f, decimal, decimal);
-    content: counter(f, unknowntype);
   }
 
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/content-counters-018.htm b/tests/wpt/css-tests/css21_dev/html4/content-counters-018.htm
index fa5490bc9e4..92e7eccef8c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/content-counters-018.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/content-counters-018.htm
@@ -21,7 +21,6 @@
     content: counters(f, decimal, ".");
     content: counters(f, ".", decimal, decimal);
     content: counters(f, ".", decimal, ".");
-    content: counters(f, ".", unknowntype);
   }
 
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-001.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-001.htm
index ff2efe28b31..9832d1e14fb 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-001.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/001.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/core-syntax-001-ref.htm">
   <style type="text/css">
    .test { color: green; }
    .test { test { :nested; color: yellow; background: red; }: not-nested; text-decoration: underline; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-002.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-002.htm
index ab55d2d7218..94a00340b14 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-002.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/core-syntax-002-ref.htm">
   <style type="text/css">
    .instruct { color: black; background: white; }
    p {
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-003.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-003.htm
index c75d7746142..944c0fdaeb1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-003.htm
@@ -5,9 +5,10 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/003.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">p{color:green;/*no"}"*/span{color:yellow;background:red;}.test{color:maroon;background:yellow;}}</style>
  </head>
  <body>
-  <p>This line <span>should</span> be <span class="test">all green</span>.</p>
+  <p>This text <span>should</span> be <span class="test">green</span>.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-004.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-004.htm
index 319390c6da3..f98ec2ac5fe 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-004.htm
@@ -5,12 +5,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002-demo.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
  body { color : green ; p{color : red ; }
  span { color : red ; }
   </style>
  </head>
  <body>
-  <p>This <span>sentence</span> should be <span>green</span>.</p>
+  <p>This <span>text</span> should be <span>green</span>.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-006.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-006.htm
index cbad75a57aa..566f916331f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-006.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/006.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/core-syntax-006-ref.htm">
   <style type="text/css">
    body { color: green; }
    p { background: red ! fail; color: yellow ! fail }
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-007.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-007.htm
index 13d36d4df5a..60714bd3bf5 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-007.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/007.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/core-syntax-007-ref.htm">
   <style type="text/css">
    body { font-size: 200px; }
    p { font-size: 16px; font-size: 200!invalid; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-008.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-008.htm
index 17798524bda..22dd62dcf8b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-008.htm
@@ -5,12 +5,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/008.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
    body { color: green; }
    p { color: 1111ff; }
   </style>
  </head>
  <body>
-  <p>This line should be green.</p>
+  <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/core-syntax-009.htm b/tests/wpt/css-tests/css21_dev/html4/core-syntax-009.htm
index 4cec56adf7a..2d635a7fdeb 100644
--- a/tests/wpt/css-tests/css21_dev/html4/core-syntax-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/core-syntax-009.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Syntactic White Space</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="assert" content="Only the characters U+0020, U+0009, U+000A,     U+000D, and U+000C are considered white space.">
   <style type="text/css">
     @import "support/core-syntax-009.css";
@@ -20,7 +21,7 @@
  </head>
  <body>
   <div>
-   <p>This sentence must be green.</p>
+   <p>This text should be green.</p>
   </div>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-001.htm b/tests/wpt/css-tests/css21_dev/html4/counters-001.htm
index 1cf4ac4cd6e..2a819871c52 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter functions with just the identifier</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html">
+        <link rel="match" href="reference/counters-001-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Counters can be referred to using only the identifier.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-003.htm b/tests/wpt/css-tests/css21_dev/html4/counters-003.htm
index 58bb1ec9262..d393cde975d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-003.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter() function with no white space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-003-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counter function can be parsed with no white space separating the function values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-004.htm b/tests/wpt/css-tests/css21_dev/html4/counters-004.htm
index 438911be245..37786e48ebe 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-004.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with no white space and two function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-004-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counters function can be parsed with no white space separating the two function values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-005.htm b/tests/wpt/css-tests/css21_dev/html4/counters-005.htm
index 2e5b4dd233e..692decea0f2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-005.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with no white space and three function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-003-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counters function can be parsed with no white space separating the three function values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-006.htm b/tests/wpt/css-tests/css21_dev/html4/counters-006.htm
index ffbbea9954d..955271b7515 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-006.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter() function with white space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-004-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counter function can be parsed with white space separating the function value.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-007.htm b/tests/wpt/css-tests/css21_dev/html4/counters-007.htm
index 7e9228287db..2e7a129b306 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-007.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter() function with white space and two function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-003-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counter function can be parsed with white space separating the two function values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-008.htm b/tests/wpt/css-tests/css21_dev/html4/counters-008.htm
index 586ad4565bc..b9e3fa9f0c8 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-008.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with white space and two function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-004-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counters function can be parsed with white space separating the two function values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-009.htm b/tests/wpt/css-tests/css21_dev/html4/counters-009.htm
index a4c755a45b7..83d81da7522 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-009.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with white space and three function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-003-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="The counters function can be parsed with white space separating the three function values.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/counters-010.htm b/tests/wpt/css-tests/css21_dev/html4/counters-010.htm
index 4e3574039c9..4527c000f16 100644
--- a/tests/wpt/css-tests/css21_dev/html4/counters-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/counters-010.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() functions</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/counters-010-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="To refer to a sequence of nested counters of the same name, the notation is 'counters(identifier, string)' or 'counters(identifier, string, list-style-type)'.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/declaration-001.htm b/tests/wpt/css-tests/css21_dev/html4/declaration-001.htm
index 4e4287aa2cb..9a49c68e012 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declaration-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declaration-001.htm
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing ':', value, part 1</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p { color:green; color }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/declaration-002.htm b/tests/wpt/css-tests/css21_dev/html4/declaration-002.htm
index b90d211edfc..15c8e37cdf2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declaration-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declaration-002.htm
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing ':', value, part 2</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p { color:red;   color; color:green }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/declaration-003.htm b/tests/wpt/css-tests/css21_dev/html4/declaration-003.htm
index 590f3e1d4fc..faa8764c730 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declaration-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declaration-003.htm
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing value, part 1</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p { color:green; color: }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/declaration-004.htm b/tests/wpt/css-tests/css21_dev/html4/declaration-004.htm
index 87b6c37cdbb..685a8abd866 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declaration-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declaration-004.htm
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing value, part 2</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p { color:red; color:; color:green }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/declaration-005.htm b/tests/wpt/css-tests/css21_dev/html4/declaration-005.htm
index 3c2505dc238..e3ec1a3411c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declaration-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declaration-005.htm
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration: unexpected tokens { }, part 1</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p { color:green; color{;color:maroon} } 
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/declaration-006.htm b/tests/wpt/css-tests/css21_dev/html4/declaration-006.htm
index 1bbb134c176..330f5a02ec7 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declaration-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declaration-006.htm
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration: unexpected tokens { }, part 2</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
     p { color:red; color{;color:maroon}; color:green } 
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/declarations-009.htm b/tests/wpt/css-tests/css21_dev/html4/declarations-009.htm
index f506e7a08b6..80f3d2839f9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/declarations-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/declarations-009.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Ignoring at-rules inside declaration blocks</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/declarations-009-ref.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="At-rules inside declaration blocks are parsed as malformed declarations.">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/escaped-newline-001.htm b/tests/wpt/css-tests/css21_dev/html4/escaped-newline-001.htm
index 96dbb7c030a..a8ffe7d9454 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escaped-newline-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escaped-newline-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing strings with escaped newlines</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings">
+        <link rel="match" href="reference/escaped-newline-001-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Strings with escaped newlines are treated as a single whole string.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-000.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-000.htm
index ae95ba33439..d5ab9e78b89 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Escaped Newline in String</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/escapes-000-ref.htm">
   <style type="text/css">
 
   p.one:before { content: "This "; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-001.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-001.htm
index 5459f84d13c..eb48ca2fd3e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Escaped Quote Marks in String</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-002.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-002.htm
index 12342892130..83a4b52a632 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-002.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Punctuation Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p.class#id { background: green; color: white; }
@@ -23,7 +24,7 @@
  </head>
  <body>
 
- <p class="class" id="id">This paragraph should have a green background.</p>
+ <p class="class" id="id">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/escapes-003.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-003.htm
index e32a74791a2..d972fcadcff 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-003.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Class and Keyword Letter Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-004.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-004.htm
index a1c537ab142..edce573c00a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-004.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Unicode Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-005.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-005.htm
index 683de185ee7..5e659aa612d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-005.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Unicode Escapes and Case Insensitivity</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-006.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-006.htm
index d448eaac379..5ae66760526 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-006.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Incorrect Letter Escape (Class Selector)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p.class { background: green; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-007.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-007.htm
index 592429e54a5..3b03a4e8987 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-007.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Space-terminated Unicode Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-008.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-008.htm
index 572af16b5c0..e04bda44ebc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-008.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Space-terminated Character Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-009.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-009.htm
index 41313e38be3..a7df401b64e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-009.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Characters and case: Escaping a character inside a keyword</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="Browsers should be able to ignore the keyword">
 <style type="text/css">
@@ -12,6 +13,6 @@ p {color: r\ed}
 </style>
  </head>
  <body>
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-010.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-010.htm
index ac1fd20f7b6..a45579ec251 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-010.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Unicode-escaped Braces</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="Unicode escapes cannot substitute for '{' or '}' in CSS syntax.">
 <style type="text/css">
@@ -14,6 +15,6 @@ p \7B color: red \7D
 </style>
  </head>
  <body>
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-011.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-011.htm
index caa3cec6354..8e4ebdc01d6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-011.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-011.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/quotes/001.xml" type="application/xhtml+xml">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
    p { color: green; color: \r\e\d; } /* '\r\e\d' is 'r^N^M', which isn't valid */
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-012.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-012.htm
index 7352bfe2bd9..024db86ab7a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-012.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-012.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/quotes/002.xml" type="application/xhtml+xml">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
    p { color: red; color: \g\r\45\65\n; } /* 'grEen' */
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/html4/escapes-013.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-013.htm
index ee243a6009f..cd279bf517f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-013.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-013.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/escaping/003.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">
+  <link rel="match" href="reference/escapes-013-ref.htm">
   <style type="text/css">
    .css\0031 p { color: yellow; background: red; }
    .css\0032 p { color: white; background: green; }
@@ -12,6 +13,6 @@
  </head>
  <body>
   <div class="css1"><p>This line should be unstyled.</p></div>
-  <p class="css2p">This line should be green.</p>
+  <p class="css2p">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/escapes-014.htm b/tests/wpt/css-tests/css21_dev/html4/escapes-014.htm
index 27cf2a65e3e..2455a8a863b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/escapes-014.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/escapes-014.htm
@@ -5,12 +5,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/escaping/004.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
    .test { color: white; background: green; }
    .test { color:\0020yellow; background:\0020red; }
   </style>
  </head>
  <body>
-  <p class="test">This line should be green.</p>
+  <p class="test">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/font-family-invalid-characters-003.htm b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-003.htm
index 01890f37a53..1e303f8c145 100644
--- a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-003.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-004.htm b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-004.htm
index 3b852bff909..06afaf605dc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-004.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-005.htm b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-005.htm
index e384e370e71..7b9d7e5d648 100644
--- a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-005.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-005-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-006.htm b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-006.htm
index 33454ce30ba..d94ba896c26 100644
--- a/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/font-family-invalid-characters-006.htm
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop">
+        <link rel="match" href="reference/font-family-invalid-characters-006-ref.htm">
         <meta name="flags" content="ahem invalid">
         <meta name="assert" content="Invalid characters in font family names.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-000.htm b/tests/wpt/css-tests/css21_dev/html4/ident-000.htm
index 3d09117ed4c..cf19630690f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (a-z) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-001.htm b/tests/wpt/css-tests/css21_dev/html4/ident-001.htm
index cd408de30b2..873ebd4a322 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-002.htm b/tests/wpt/css-tests/css21_dev/html4/ident-002.htm
index 4107b7b01a8..eeb4b27d24a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-002.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with _) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-003.htm b/tests/wpt/css-tests/css21_dev/html4/ident-003.htm
index 0455979c84c..b57f4a42a57 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-003.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="author" title="Ray Kiddy" href="mailto:ray@ganymede.org">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-004.htm b/tests/wpt/css-tests/css21_dev/html4/ident-004.htm
index f7e500a2d7e..f00c5b1904c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-004.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with ideographic) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-005.htm b/tests/wpt/css-tests/css21_dev/html4/ident-005.htm
index 371a758645c..3bd41e920bf 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-005.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including ideographic) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-006.htm b/tests/wpt/css-tests/css21_dev/html4/ident-006.htm
index 26399b9df60..410f49b6c96 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-006.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escape) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-007.htm b/tests/wpt/css-tests/css21_dev/html4/ident-007.htm
index 861f7bf7733..65a35b58bd9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-007.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including escape) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-008.htm b/tests/wpt/css-tests/css21_dev/html4/ident-008.htm
index 941f5ac9e71..b2d2f635aaf 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-008.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Identifiers (starting with digit) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <meta name="flags" content="invalid">
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-009.htm b/tests/wpt/css-tests/css21_dev/html4/ident-009.htm
index 6a47ac92d3b..32e4c88aca2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-009.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including digits) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-010.htm b/tests/wpt/css-tests/css21_dev/html4/ident-010.htm
index 54ab334b974..a79ab7e2d43 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-010.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escape) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-011.htm b/tests/wpt/css-tests/css21_dev/html4/ident-011.htm
index 649f821db9e..037213bbd70 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-011.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-011.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including escapes) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-012.htm b/tests/wpt/css-tests/css21_dev/html4/ident-012.htm
index b9ebac34595..c34730dabd6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-012.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-012.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-012-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-013.htm b/tests/wpt/css-tests/css21_dev/html4/ident-013.htm
index 053e04a79c9..490b2d85dcc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-013.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-013.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escaped -) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/ident-020.htm b/tests/wpt/css-tests/css21_dev/html4/ident-020.htm
index 4b770fbee3c..1bea82fc9a2 100644
--- a/tests/wpt/css-tests/css21_dev/html4/ident-020.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/ident-020.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Identifiers (starting with double -) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters">
+  <link rel="match" href="reference/ident-000-ref.htm">
 
   <meta name="flags" content="invalid">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/import-000.htm b/tests/wpt/css-tests/css21_dev/html4/import-000.htm
index 8189bbd4b86..09db3ad7a3c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/import-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/import-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
 
   <meta name="flags" content="invalid">
   <style type="text/css">
@@ -15,7 +16,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/import-001.htm b/tests/wpt/css-tests/css21_dev/html4/import-001.htm
index 45bca19f855..3ebd3f88c1f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/import-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/import-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
 
   <meta name="flags" content="invalid">
   <style type="text/css">
@@ -17,7 +18,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/keywords-000.htm b/tests/wpt/css-tests/css21_dev/html4/keywords-000.htm
index 5f1900818a0..e0bc4358eeb 100644
--- a/tests/wpt/css-tests/css21_dev/html4/keywords-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/keywords-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Keywords v. Strings (background)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#keywords">
+  <link rel="match" href="reference/ref-green-background.htm">
   <style type="text/css">
 
   p { background: green; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/keywords-001.htm b/tests/wpt/css-tests/css21_dev/html4/keywords-001.htm
index 683239598b5..c6adfcef64b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/keywords-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/keywords-001.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Keywords v. Strings (width)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#keywords">
+  <link rel="match" href="reference/keywords-001-ref.htm">
   <style type="text/css">
 
   p.one, p.two { width: 10em; border: medium solid; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/list-style-020.htm b/tests/wpt/css-tests/css21_dev/html4/list-style-020.htm
index 35c8fa04878..98b6cb56c3b 100644
--- a/tests/wpt/css-tests/css21_dev/html4/list-style-020.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/list-style-020.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: 'list-style' shorthand and 'none' values</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">
+  <link rel="match" href="reference/list-style-020-ref.htm">
   <meta name="assert" content="">
   <style type="text/css">
     /* For better readability */
@@ -22,9 +23,8 @@
       display: list-item;
       list-style: disc;
       margin: 0.2em 0 0.2em 4em;
+      border-left: solid thin orange;
     }
-    .inside span { border-left: solid thin orange; }
-    .outside { border-left: solid thin orange; }
 
     .one   { list-style: none; color: red; }
     .two   { list-style: none none; color: red; }
@@ -49,13 +49,13 @@
    <p>Test passes if each word on the right of the orange line
     describes the shape on the left.</p>
 
-   <div class="li one outside"><span>(nothing)</span></div>
-   <div class="li two outside"><span>(nothing)</span></div>
-   <div class="li three outside"><span>blue square</span></div>
-   <div class="li four outside"><span>blue square</span></div>
-   <div class="li five outside"><span>purple diamond</span></div>
-   <div class="li six outside"><span>purple diamond</span></div>
-   <div class="li seven outside"><span>blue circle</span></div>
+   <div class="li one"><span>(nothing)</span></div>
+   <div class="li two"><span>(nothing)</span></div>
+   <div class="li three"><span>blue square</span></div>
+   <div class="li four"><span>blue square</span></div>
+   <div class="li five"><span>purple diamond</span></div>
+   <div class="li six"><span>purple diamond</span></div>
+   <div class="li seven"><span>blue circle</span></div>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/matching-brackets-001.htm b/tests/wpt/css-tests/css21_dev/html4/matching-brackets-001.htm
index d72035b4ac7..bd249ca73b6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/matching-brackets-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/matching-brackets-001.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule">
+  <link rel="match" href="reference/matching-brackets-001-ref.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing an at-rule by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. ">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/matching-brackets-002.htm b/tests/wpt/css-tests/css21_dev/html4/matching-brackets-002.htm
index 166091f3551..ee1ee70c04f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/matching-brackets-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/matching-brackets-002.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule">
+  <link rel="match" href="reference/matching-brackets-002-ref.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing a declaration by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. ">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/matching-brackets-003.htm b/tests/wpt/css-tests/css21_dev/html4/matching-brackets-003.htm
index 7a30e059ba2..4def624940e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/matching-brackets-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/matching-brackets-003.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule">
+  <link rel="match" href="reference/matching-brackets-001-ref.htm">
   <meta name="flags" content="invalid">
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing a declaration by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. ">
  <!-- simple -->
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-004.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-004.htm
index 23ef2235824..daa1cebd47e 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-004.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing integer numbers with '+'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#numbers">
+        <link rel="match" href="reference/ref-filled-black-96px-square.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Integers can be preceded by '+'.">
         <style type="text/css">
@@ -17,7 +18,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a box below.</p>
+        <p>Test passes if there is a filled black square.</p>
         <div></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-006.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-006.htm
index 4e51483648b..def30f76665 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-006.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-006.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Unsupported negative values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/ref-filled-black-96px-square.htm">
         <meta name="flags" content="invalid">
         <meta name="assert" content="If a negative length value is set on a property that does not allow negative length values, the declaration is ignored.">
         <style type="text/css">
@@ -17,7 +18,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a box below.</p>
+        <p>Test passes if there is a filled black square.</p>
         <div></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-007.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-007.htm
index 0f1de49a252..b5fb999c655 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-007.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-007.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Em sizes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-007-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (default) of the element on which it is used.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-009.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-009.htm
index 14321d80d0c..eb713aead59 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-009.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-009.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with the font-size set to px size</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-009-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (pixels) of the element on which it is used.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-010.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-010.htm
index c26d7d01ed2..2d5f3c8682c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-010.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-010.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to inch</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-010-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (inches) of the element on which it is used.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-011.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-011.htm
index d240c4b447a..b163a57226c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-011.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-011.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to em</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-011-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="When 'em' is assigned in the value of the 'font-size' property itself, it uses the font size of the parent element.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-012.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-012.htm
index f77abba04e5..4f5d1ef2c73 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-012.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-012.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to ex</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-012-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (ex) of the element on which it is used.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-013.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-013.htm
index 5f9f6762420..ec64d986fcc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-013.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-013.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to percentage</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-013-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property of the element on which it is used.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-015.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-015.htm
index 2187a9340ab..7d06beca0bc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-015.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-015.htm
@@ -4,6 +4,8 @@
         <title>CSS Test: Height of EX</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-014-ref-a.htm">
+        <link rel="match" href="reference/numbers-units-014-ref-b.htm">
         <meta name="flags" content="ahem should">
         <meta name="assert" content="In the cases where it is impossible or impractical to determine the x-height, a value of 0.5em should be used.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-018.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-018.htm
index d3ffe001250..78e20abf8df 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-018.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-018.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Specifying em/ex on the root element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-018-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="Units 'em' and 'ex' refer to the initial value of the property when specified on the root element of a document.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-019.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-019.htm
index 6edafeea72a..9e4a4da3b88 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-019.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-019.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: First available font defines the 'ex' unit size</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-019-ref.htm">
         <meta name="flags" content="ahem">
         <meta name="assert" content="The 'ex' unit size is defined by the element's first available font.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/numbers-units-021.htm b/tests/wpt/css-tests/css21_dev/html4/numbers-units-021.htm
index 3eabc7859cd..dc1efe502d9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/numbers-units-021.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/numbers-units-021.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Root element and the 'em' unit size</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+        <link rel="match" href="reference/numbers-units-021-ref.htm">
         <meta name="flags" content="96dpi ahem">
         <meta name="assert" content="The 'em' unit refers to the property's initial value when specified on the root element.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/positive-integer-001.htm b/tests/wpt/css-tests/css21_dev/html4/positive-integer-001.htm
deleted file mode 100644
index 644474ee78b..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/positive-integer-001.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <title>CSS Test: Parsing signed integers</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
-        <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#numbers">
-        <meta name="flags" content="">
-        <meta name="assert" content="Positively signed integers are treated the same as non-signed integers.">
-        <style type="text/css">
-            div
-            {
-                background-color: black;
-                height: 0.5in;
-            }
-            #div1
-            {
-                width: +1in;
-            }
-            #div2
-            {
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled square below.</p>
-        <div id="div1"></div>
-        <div id="div2"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/quoted-string-001.htm b/tests/wpt/css-tests/css21_dev/html4/quoted-string-001.htm
index 894aa08281a..9806ea853bc 100644
--- a/tests/wpt/css-tests/css21_dev/html4/quoted-string-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/quoted-string-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of single quotes inside double quotes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings">
+        <link rel="match" href="reference/quoted-string-001-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Single quotes are allowed in strings that are double quoted.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/quoted-string-002.htm b/tests/wpt/css-tests/css21_dev/html4/quoted-string-002.htm
index 9eeb632e8df..fe259d68738 100644
--- a/tests/wpt/css-tests/css21_dev/html4/quoted-string-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/quoted-string-002.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of double quotes inside single quotes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings">
+        <link rel="match" href="reference/quoted-string-002-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Double quotes are allowed in strings that are single quoted.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/quoted-string-003.htm b/tests/wpt/css-tests/css21_dev/html4/quoted-string-003.htm
index 12589342732..70fd4f3b52d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/quoted-string-003.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/quoted-string-003.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of escaped quotes (single within single)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings">
+        <link rel="match" href="reference/quoted-string-001-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Single quotes cannot occur inside single quotes unless escaped.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/quoted-string-004.htm b/tests/wpt/css-tests/css21_dev/html4/quoted-string-004.htm
index 6d23f76be7a..900c7853931 100644
--- a/tests/wpt/css-tests/css21_dev/html4/quoted-string-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/quoted-string-004.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of escaped double quotes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings">
+        <link rel="match" href="reference/quoted-string-002-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Double quotes cannot occur inside double quotes unless escaped.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/at-rule-013-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/at-rule-013-ref.htm
new file mode 100644
index 00000000000..488c68b9a46
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/at-rule-013-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/attribute-token-selector-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/attribute-token-selector-002-ref.htm
new file mode 100644
index 00000000000..ce58e867281
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/attribute-token-selector-002-ref.htm
@@ -0,0 +1,19 @@
+<!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: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/bidi-004-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/bidi-004-ref.htm
new file mode 100644
index 00000000000..66d853ab88b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/bidi-004-ref.htm
@@ -0,0 +1,33 @@
+<!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="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+  <meta name="flags" content="ahem">
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/blocks-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/blocks-001-ref.htm
new file mode 100644
index 00000000000..a818f877b6a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/blocks-001-ref.htm
@@ -0,0 +1,15 @@
+<!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>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/c547-indent-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/c547-indent-000-ref.htm
new file mode 100644
index 00000000000..7ecddbb29ba
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/c547-indent-000-ref.htm
@@ -0,0 +1,27 @@
+<!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 {
+  font: 24px/1 Ahem;
+  width: 18em;
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a tall solid unbroken column of blue below.</p>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+<div>&nbsp;x</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/c5510-padn-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/c5510-padn-000-ref.htm
new file mode 100644
index 00000000000..4811a1f9204
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/c5510-padn-000-ref.htm
@@ -0,0 +1,42 @@
+<!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 {
+  width: 138px;
+  color: orange;
+  font-size: 10px;
+  line-height: 1;
+}
+div p {
+  padding: 0;
+  border: solid 24px yellow;
+}
+img {
+  vertical-align: bottom;
+}
+</style>
+</head>
+<body>
+<p>The five diagrams below should be identical.</p>
+<div>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10">
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10">
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10">
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10">
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10"><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10">
+ </p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/case-sensitive-003-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/case-sensitive-003-ref.htm
new file mode 100644
index 00000000000..1d618ad58bf
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/case-sensitive-003-ref.htm
@@ -0,0 +1,22 @@
+<!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: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/case-sensitive-005-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/case-sensitive-005-ref.htm
new file mode 100644
index 00000000000..654ef9e1afa
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/case-sensitive-005-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">
+span {
+  color: blue;
+  font: larger bold monospace;
+}
+</style>
+</head>
+<body>
+<p>The number 99 must appear below.</p>
+<p><span>9</span><span>9</span></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/color-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/color-000-ref.htm
new file mode 100644
index 00000000000..730be97f2df
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/color-000-ref.htm
@@ -0,0 +1,24 @@
+<!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: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/colors-006-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/colors-006-ref.htm
new file mode 100644
index 00000000000..21e847d4556
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/colors-006-ref.htm
@@ -0,0 +1,107 @@
+<!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">
+.maroonhex {
+  background: #800000;
+}
+.redhex {
+  background: #ff0000;
+}
+.orangehex {
+  background: #ffa500;
+}
+.yellowhex {
+  background: #ffff00;
+}
+.olivehex {
+  background: #808000;
+}
+.purplehex {
+  background: #800080;
+}
+.fuchsiahex {
+  background: #ff00ff;
+}
+.whitehex {
+  background: #ffffff;
+}
+.limehex {
+  background: #00ff00;
+}
+.greenhex {
+  background: #008000;
+}
+.navyhex {
+  background: #000080;
+}
+.bluehex {
+  background: #0000ff;
+}
+.aquahex {
+  background: #00ffff;
+}
+.tealhex {
+  background: #008080;
+}
+.blackhex {
+  background: #000000;
+}
+.silverhex {
+  background: #c0c0c0;
+}
+.grayhex {
+  background: #808080;
+}
+td {
+  height: 0.5in;
+  width: 0.5in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the first row of boxes below match the second row of boxes below.</p>
+<table>
+  <tr>
+    <td class="maroonhex"></td>
+    <td class="redhex"></td>
+    <td class="orangehex"></td>
+    <td class="yellowhex"></td>
+    <td class="olivehex"></td>
+    <td class="purplehex"></td>
+    <td class="fuchsiahex"></td>
+    <td class="whitehex"></td>
+    <td class="limehex"></td>
+    <td class="greenhex"></td>
+    <td class="navyhex"></td>
+    <td class="bluehex"></td>
+    <td class="aquahex"></td>
+    <td class="tealhex"></td>
+    <td class="blackhex"></td>
+    <td class="silverhex"></td>
+    <td class="grayhex"></td>
+  </tr>
+  <tr>
+    <td class="maroonhex"></td>
+    <td class="redhex"></td>
+    <td class="orangehex"></td>
+    <td class="yellowhex"></td>
+    <td class="olivehex"></td>
+    <td class="purplehex"></td>
+    <td class="fuchsiahex"></td>
+    <td class="whitehex"></td>
+    <td class="limehex"></td>
+    <td class="greenhex"></td>
+    <td class="navyhex"></td>
+    <td class="bluehex"></td>
+    <td class="aquahex"></td>
+    <td class="tealhex"></td>
+    <td class="blackhex"></td>
+    <td class="silverhex"></td>
+    <td class="grayhex"></td>
+  </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-000-ref.htm
new file mode 100644
index 00000000000..96319c522c7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-000-ref.htm
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+</div>
+<div>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-001-ref.htm
new file mode 100644
index 00000000000..cca984559f7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-001-ref.htm
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+</div>
+<div>
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-002-ref.htm
new file mode 100644
index 00000000000..19e724747e2
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-002-ref.htm
@@ -0,0 +1,48 @@
+<!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 {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a string of 12 blue filled circles below. (A string of
+12 black circles is provided on the second line for reference.):</p>
+<div id="test">
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+</div>
+<div>
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-003-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-003-ref.htm
new file mode 100644
index 00000000000..3334118d17b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-003-ref.htm
@@ -0,0 +1,48 @@
+<!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 {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a string of 12 blue hollow circles below. (A string of
+12 black hollow circles is provided on the second line for reference.):</p>
+<div id="test">
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+</div>
+<div>
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-004-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-004-ref.htm
new file mode 100644
index 00000000000..1853d541c38
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-004-ref.htm
@@ -0,0 +1,33 @@
+<!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 {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there are 12 blue filled squares below.</p>
+<div id="test">
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-006-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-006-ref.htm
new file mode 100644
index 00000000000..a362755e1f8
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-006-ref.htm
@@ -0,0 +1,49 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+99
+100
+101
+</div>
+<div>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+99
+100
+101
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-007-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-007-ref.htm
new file mode 100644
index 00000000000..d05fccf3679
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-007-ref.htm
@@ -0,0 +1,57 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+i
+ii
+iii
+iv
+v
+vi
+vii
+viii
+ix
+x
+xi
+xii
+xlix
+l
+ccclxxxix
+cccxc
+mmmcdlxxxix
+mmmcdxc
+mmmcdxci
+</div>
+<div>
+i
+ii
+iii
+iv
+v
+vi
+vii
+viii
+ix
+x
+xi
+xii
+xlix
+l
+ccclxxxix
+cccxc
+mmmcdlxxxix
+mmmcdxc
+mmmcdxci
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-008-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-008-ref.htm
new file mode 100644
index 00000000000..bc718fbcccb
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-008-ref.htm
@@ -0,0 +1,57 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+I
+II
+III
+IV
+V
+VI
+VII
+VIII
+IX
+X
+XI
+XII
+XLIX
+L
+CCCLXXXIX
+CCCXC
+MMMCDLXXXIX
+MMMCDXC
+MMMCDXCI
+</div>
+<div>
+I
+II
+III
+IV
+V
+VI
+VII
+VIII
+IX
+X
+XI
+XII
+XLIX
+L
+CCCLXXXIX
+CCCXC
+MMMCDLXXXIX
+MMMCDXC
+MMMCDXCI
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-009-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-009-ref.htm
new file mode 100644
index 00000000000..dd3328b891c
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-009-ref.htm
@@ -0,0 +1,99 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+ა
+ბ
+გ
+დ
+ე
+ვ
+ზ
+ჱ
+თ
+ი
+ია
+იბ
+კ
+ლ
+მ
+ნ
+ჲ
+ო
+პ
+ჟ
+რ
+ს
+ტ
+ჳ
+ფ
+ქ
+ღ
+ყ
+შ
+ჩ
+ც
+ძ
+წ
+ჭ
+ხ
+ჴ
+ჯ
+ჰ
+ჵ
+ჵჰშჟთ
+</div>
+<div>
+ა
+ბ
+გ
+დ
+ე
+ვ
+ზ
+ჱ
+თ
+ი
+ია
+იბ
+კ
+ლ
+მ
+ნ
+ჲ
+ო
+პ
+ჟ
+რ
+ს
+ტ
+ჳ
+ფ
+ქ
+ღ
+ყ
+შ
+ჩ
+ც
+ძ
+წ
+ჭ
+ხ
+ჴ
+ჯ
+ჰ
+ჵ
+ჵჰშჟთ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-010-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-010-ref.htm
new file mode 100644
index 00000000000..95561edf080
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-010-ref.htm
@@ -0,0 +1,97 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+Ա
+Բ
+Գ
+Դ
+Ե
+Զ
+Է
+Ը
+Թ
+Ժ
+ԺԱ
+ԺԲ
+Ի
+Լ
+Խ
+Ծ
+Կ
+Հ
+Ձ
+Ղ
+Ճ
+Մ
+Յ
+Ն
+Շ
+Ո
+Չ
+Պ
+Ջ
+Ռ
+Ս
+Վ
+Տ
+Ր
+Ց
+Ւ
+Փ
+Ք
+ՔՋՂԹ
+</div>
+<div>
+Ա
+Բ
+Գ
+Դ
+Ե
+Զ
+Է
+Ը
+Թ
+Ժ
+ԺԱ
+ԺԲ
+Ի
+Լ
+Խ
+Ծ
+Կ
+Հ
+Ձ
+Ղ
+Ճ
+Մ
+Յ
+Ն
+Շ
+Ո
+Չ
+Պ
+Ջ
+Ռ
+Ս
+Վ
+Տ
+Ր
+Ց
+Ւ
+Փ
+Ք
+ՔՋՂԹ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-011-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-011-ref.htm
new file mode 100644
index 00000000000..1369a4800f9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-011-ref.htm
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+</div>
+<div>
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-013-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-013-ref.htm
new file mode 100644
index 00000000000..0b44d41b906
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-013-ref.htm
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+</div>
+<div>
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-015-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-015-ref.htm
new file mode 100644
index 00000000000..3036a0f7756
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/content-counter-015-ref.htm
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+α
+β
+γ
+δ
+ε
+ζ
+η
+θ
+ι
+κ
+λ
+μ
+</div>
+<div>
+α
+β
+γ
+δ
+ε
+ζ
+η
+θ
+ι
+κ
+λ
+μ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-001-ref.htm
new file mode 100644
index 00000000000..cd8bfbd0d71
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-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">
+p {
+  color: green;
+  text-decoration: underline;
+}
+</style>
+</head>
+<body>
+<p>This sentence should be green and underlined.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-002-ref.htm
new file mode 100644
index 00000000000..0f7516616e1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-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">
+p.test {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>There must be no red.</p>
+<p class="test">This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-006-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-006-ref.htm
new file mode 100644
index 00000000000..b4239741ac9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-006-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>This line should be green.</p>
+<div>This line should be green.</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-007-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-007-ref.htm
new file mode 100644
index 00000000000..d5b78c63472
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/core-syntax-007-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 {
+  font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if this text is not dramatically taller than the text below.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/counters-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/counters-001-ref.htm
new file mode 100644
index 00000000000..bf0b8949100
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/counters-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">
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a number "1" below.</p>
+<div>1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/counters-003-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/counters-003-ref.htm
new file mode 100644
index 00000000000..25b34530194
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/counters-003-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 the equation below is true.</p>
+<p>I = I</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/counters-004-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/counters-004-ref.htm
new file mode 100644
index 00000000000..e64d512a406
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/counters-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 the equation below is true.</p>
+<p>1 = 1</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/counters-010-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/counters-010-ref.htm
new file mode 100644
index 00000000000..a5427b7c2d4
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/counters-010-ref.htm
@@ -0,0 +1,15 @@
+<!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 equations below are true.</p>
+<p>1 = 1</p>
+<p>1.1 = 1.1</p>
+<p>1.2 = 1.2</p>
+<p>i.iii = i.iii</p>
+<p>I.IV = I.IV</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/declarations-009-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/declarations-009-ref.htm
new file mode 100644
index 00000000000..23365b05db7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/declarations-009-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/escaped-newline-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/escaped-newline-001-ref.htm
new file mode 100644
index 00000000000..ddd695ea8d6
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/escaped-newline-001-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 the words "Filler Text" below are all on the same line.</p>
+<div>Filler Text Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/escapes-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/escapes-000-ref.htm
new file mode 100644
index 00000000000..4d8647dbe4e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/escapes-000-ref.htm
@@ -0,0 +1,13 @@
+<!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>The following three paragraphs should look identical:</p>
+<p>This is a test paragraph.</p>
+<p>This is a test paragraph.</p>
+<p>This is a test paragraph.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/escapes-013-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/escapes-013-ref.htm
new file mode 100644
index 00000000000..10cd4cf5156
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/escapes-013-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: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This line should be unstyled.</p>
+<p class="green">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/font-family-invalid-characters-005-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/font-family-invalid-characters-005-ref.htm
new file mode 100644
index 00000000000..33a0c7f6c7f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/font-family-invalid-characters-005-ref.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8">
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel">
+</head><body>
+  <p>Test passes if there are only numbers (1-4) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+    <div>3</div>
+    <div>4</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/font-family-invalid-characters-006-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/font-family-invalid-characters-006-ref.htm
new file mode 100644
index 00000000000..ba316f07cec
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/font-family-invalid-characters-006-ref.htm
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html><head><meta charset="utf-8">
+<title>CSS Reference</title>
+<link href="http://www.intel.com" rel="author" title="Intel">
+</head><body>
+  <p>Test passes if there are only numbers (1-2) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/ident-000-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/ident-000-ref.htm
new file mode 100644
index 00000000000..072bf55dd4b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/ident-000-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/ident-012-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/ident-012-ref.htm
new file mode 100644
index 00000000000..2d6ce710fd6
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/ident-012-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/keywords-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/keywords-001-ref.htm
new file mode 100644
index 00000000000..8a8fe0f0a70
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/keywords-001-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">
+p.test {
+  width: 10em;
+  border: medium solid;
+}
+</style>
+</head>
+<body>
+<p>The next two paragraphs should look identical:</p>
+<p class="test">Test.</p>
+<p class="test">Test.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/list-style-020-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/list-style-020-ref.htm
new file mode 100644
index 00000000000..2c531cf8f0e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/list-style-020-ref.htm
@@ -0,0 +1,74 @@
+<!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">
+/* For better readability */
+.li {
+  font-size: 1.5em;
+  color: blue;
+}
+span {
+  color: black;
+  font-size: 0.67em;
+  vertical-align: middle;
+  padding-left: 0.2em;
+}
+
+.li {
+  display: list-item;
+  margin: 0.2em 0 0.2em 4em;
+  border-left: solid thin orange;
+}
+
+.one {
+  list-style-type: none;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.two {
+  list-style-type: none;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.three {
+  list-style-type: square;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.four {
+  list-style-type: square;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.five {
+  list-style-type: none;
+  list-style-image: url(support/diamond.png);
+  list-style-position: outside;
+}
+.six {
+  list-style-type: none;
+  list-style-image: url(support/diamond.png);
+  list-style-position: outside;
+}
+.seven {
+  list-style-type: disc;
+  list-style-image: none;
+  list-style-position: outside;
+}
+</style>
+</head>
+<body>
+<p>Test passes if each word on the right of the orange line
+describes the shape on the left.</p>
+
+<div class="li one"><span>(nothing)</span></div>
+<div class="li two"><span>(nothing)</span></div>
+<div class="li three"><span>blue square</span></div>
+<div class="li four"><span>blue square</span></div>
+<div class="li five"><span>purple diamond</span></div>
+<div class="li six"><span>purple diamond</span></div>
+<div class="li seven"><span>blue circle</span></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/matching-brackets-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/matching-brackets-001-ref.htm
new file mode 100644
index 00000000000..f29eea5aa06
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/matching-brackets-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/matching-brackets-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/matching-brackets-002-ref.htm
new file mode 100644
index 00000000000..1010713e6a1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/matching-brackets-002-ref.htm
@@ -0,0 +1,15 @@
+<!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: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-007-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-007-ref.htm
new file mode 100644
index 00000000000..36ebd66d8f9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-007-ref.htm
@@ -0,0 +1,19 @@
+<!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 {
+  margin-top: 10px;
+  background: black;
+  height: 1em;
+  width: 1em;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-009-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-009-ref.htm
new file mode 100644
index 00000000000..271bf963e85
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-009-ref.htm
@@ -0,0 +1,19 @@
+<!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 {
+  margin-top: 10px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-010-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-010-ref.htm
new file mode 100644
index 00000000000..387aaa90b99
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-010-ref.htm
@@ -0,0 +1,19 @@
+<!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 {
+  margin-top: 10px;
+  background: black;
+  height: 1in;
+  width: 1in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-011-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-011-ref.htm
new file mode 100644
index 00000000000..8fc2f17e709
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-011-ref.htm
@@ -0,0 +1,19 @@
+<!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 {
+  margin-top: 10px;
+  background: black;
+  height: 3em;
+  width: 3em;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-012-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-012-ref.htm
new file mode 100644
index 00000000000..3e99b86d62b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-012-ref.htm
@@ -0,0 +1,19 @@
+<!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 {
+  margin-top: 5px;
+  background: black;
+  height: 1in;
+  width: 1in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the three boxes below are the same size.</p>
+<div></div><div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-013-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-013-ref.htm
new file mode 100644
index 00000000000..a9ed7cc0703
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-013-ref.htm
@@ -0,0 +1,19 @@
+<!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 {
+  margin-top: 5px;
+  background: black;
+  height: 100px;
+  width: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the three boxes below are the same size.</p>
+<div></div><div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-018-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-018-ref.htm
new file mode 100644
index 00000000000..88af13383aa
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-018-ref.htm
@@ -0,0 +1,39 @@
+<!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">
+html {
+  border: 1px solid;
+  margin-left: 400px;
+  margin-top: 320px;
+}
+p {
+  font: 16px serif;
+}
+div {
+  position: absolute;
+}
+#div1 {
+  background: orange;
+  height: 20px;
+  left: 0;
+  top: 320px;
+  width: 400px;
+}
+#div2 {
+  background: blue;
+  height: 320px;
+  left: 400px;
+  top: 0;
+  width: 20px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the black box containing this text is to the right of the orange box and below the blue box.</p>
+<div id="div1"></div>
+<div id="div2"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-019-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-019-ref.htm
new file mode 100644
index 00000000000..8a69850d2d8
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-019-ref.htm
@@ -0,0 +1,22 @@
+<!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 {
+  font-size: 12pt;
+}
+div {
+  margin-top: 3px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-021-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-021-ref.htm
new file mode 100644
index 00000000000..f1176e12e47
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/numbers-units-021-ref.htm
@@ -0,0 +1,22 @@
+<!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 {
+  font-family: serif;
+}
+div {
+  margin-top: 2px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/quoted-string-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/quoted-string-001-ref.htm
new file mode 100644
index 00000000000..a5bec53ca71
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/quoted-string-001-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 the words "Filler Text" below are single quoted (').</p>
+<div>'Filler Text'</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/quoted-string-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/quoted-string-002-ref.htm
new file mode 100644
index 00000000000..40bc6ed1d2e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/quoted-string-002-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 the words "Filler Text" below are double quoted (").</p>
+<div>"Filler Text"</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/selectors-parsing-001-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/selectors-parsing-001-ref.htm
new file mode 100644
index 00000000000..bdfa4fb9352
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/selectors-parsing-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">
+p {
+  color: green;
+  background: white;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/sgml-comments-002-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/sgml-comments-002-ref.htm
new file mode 100644
index 00000000000..64520dc8d23
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/sgml-comments-002-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This text should be green.</p>
+<p>This text should be green.</p>
+<p>This text should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/units-005-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/units-005-ref.htm
new file mode 100644
index 00000000000..16ce9911feb
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/units-005-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">
+p {
+  font-size: 12pt;
+}
+div {
+  width: 8.7em;
+  height: 8.7em;
+  background: green;
+  border: solid lime;
+}
+}
+</style>
+</head>
+<body>
+<p>You should see no red below, just a green square with a green border.</p>
+<div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/uri-012-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/uri-012-ref.htm
new file mode 100644
index 00000000000..0bd53761d30
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/uri-012-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">
+p {
+  color: green;
+  border: solid green;
+}
+</style>
+</head>
+<body>
+<p>This sentence should be green with a green border.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/uri-016-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/uri-016-ref.htm
new file mode 100644
index 00000000000..bdad0159084
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/uri-016-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">
+p.green {
+  color: green;
+}
+p.white {
+  color: white;
+}
+</style>
+</head>
+<body>
+<p class="green">This sentence must be green and there must be no red.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="green">This sentence must be green and there must be no red.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="white">There must be no red on this page.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/reference/uri-017-ref.htm b/tests/wpt/css-tests/css21_dev/html4/reference/uri-017-ref.htm
new file mode 100644
index 00000000000..d226c5766cb
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/reference/uri-017-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">
+p {
+  color: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must have a green background.</p>
+<p>This sentence must have a green background.</p>
+</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 5702d2c89ee..0d6275b019d 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
@@ -3344,6 +3344,206 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-001" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP Charset vs BOM">
+          <a href="at-charset-001.htm">at-charset-001</a></td>
+        <td><a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-002" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP Charset over @charset">
+          <a href="at-charset-002.htm">at-charset-002</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-003" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over link charset">
+          <a href="at-charset-003.htm">at-charset-003</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-004" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over set referring code page (UTF-8)">
+          <a href="at-charset-004.htm">at-charset-004</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-005" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over set referring code page (windows-1252)">
+          <a href="at-charset-005.htm">at-charset-005</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-006" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over referring code page (not set)">
+          <a href="at-charset-006.htm">at-charset-006</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-007" class="">
+      <tr>
+        <td rowspan="1" title="@charset over link charset attribute">
+          <a href="at-charset-007.htm">at-charset-007</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-008" class="">
+      <tr>
+        <td rowspan="1" title="@charset over referring document's code page (set)">
+          <a href="at-charset-008.htm">at-charset-008</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-009" class="">
+      <tr>
+        <td rowspan="1" title="@charset over referring document's code page (unset)">
+          <a href="at-charset-009.htm">at-charset-009</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-010" class="">
+      <tr>
+        <td rowspan="1" title="Link charset attribute over referring document's codepage (set)">
+          <a href="at-charset-010.htm">at-charset-010</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-011" class="">
+      <tr>
+        <td rowspan="1" title="Link charset attribute over referring document's codepage (not set)">
+          <a href="at-charset-011.htm">at-charset-011</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-012" class="">
+      <tr>
+        <td rowspan="1" title="Stylesheet encoding via the referring document's encoding (set)">
+          <a href="at-charset-012.htm">at-charset-012</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-014" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-8)">
+          <a href="at-charset-014.htm">at-charset-014</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-015" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-16 LE)">
+          <a href="at-charset-015.htm">at-charset-015</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-016" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-16 BE)">
+          <a href="at-charset-016.htm">at-charset-016</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-019" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-8)">
+          <a href="at-charset-019.htm">at-charset-019</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-020" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-16LE)">
+          <a href="at-charset-020.htm">at-charset-020</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-021" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-16BE)">
+          <a href="at-charset-021.htm">at-charset-021</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-024" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (windows-1252)">
+          <a href="at-charset-024.htm">at-charset-024</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-025" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (Shift-JIS)">
+          <a href="at-charset-025.htm">at-charset-025</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-026" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (ISO-8859-6)">
+          <a href="at-charset-026.htm">at-charset-026</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-027" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (Big5)">
+          <a href="at-charset-027.htm">at-charset-027</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-028" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-8)">
+          <a href="at-charset-028.htm">at-charset-028</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-029" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-16LE)">
+          <a href="at-charset-029.htm">at-charset-029</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-030" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-16BE)">
+          <a href="at-charset-030.htm">at-charset-030</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-033" class="">
       <tr>
         <td rowspan="1" title="Non-matching BOM (windows-1252 with UTF-8 BOM)">
@@ -3392,6 +3592,78 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-040" class="">
+      <tr>
+        <td rowspan="1" title="Non-matching @charset (UTF-16BE with UTF-8 @charset)">
+          <a href="at-charset-040.htm">at-charset-040</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-041" class="">
+      <tr>
+        <td rowspan="1" title="Non-matching @charset (UTF-32LE with UTF-16BE @charset)">
+          <a href="at-charset-041.htm">at-charset-041</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-042" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-042.htm">at-charset-042</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-043" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)">
+          <a href="at-charset-043.htm">at-charset-043</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-044" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-044.htm">at-charset-044</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-045" class="">
+      <tr>
+        <td rowspan="1" title="Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-045.htm">at-charset-045</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-046" class="">
+      <tr>
+        <td rowspan="1" title="Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)">
+          <a href="at-charset-046.htm">at-charset-046</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-047" class="">
+      <tr>
+        <td rowspan="1" title="Endianness not specified (UTF-16LE encoding with UTF-16 @charset)">
+          <a href="at-charset-047.htm">at-charset-047</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-048" class="">
+      <tr>
+        <td rowspan="1" title="Endianness not specified (UTF-16BE encoding with UTF-16 @charset)">
+          <a href="at-charset-048.htm">at-charset-048</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-049" class="">
       <tr>
         <td rowspan="1" title="@charset preceded by a newline">
@@ -3432,6 +3704,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-054" class="">
+      <tr>
+        <td rowspan="1" title="@charset in uppercase">
+          <a href="at-charset-054.htm">at-charset-054</a></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-055" class="">
       <tr>
         <td rowspan="1" title="@charset without quotes">
@@ -3440,6 +3720,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-056" class="">
+      <tr>
+        <td rowspan="1" title="@charset missing a space">
+          <a href="at-charset-056.htm">at-charset-056</a></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-057" class="">
       <tr>
         <td rowspan="1" title="@charset escaped numerically">
@@ -3464,6 +3752,78 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-060" class="">
+      <tr>
+        <td rowspan="1" title="@charset with bogus name">
+          <a href="at-charset-060.htm">at-charset-060</a></td>
+        <td><a href="at-charset-001.htm">=</a> <a href="reference/at-charset-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-061" class="">
+      <tr>
+        <td rowspan="1" title="@charset within style block">
+          <a href="at-charset-061.htm">at-charset-061</a></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-071" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-1">
+          <a href="at-charset-071.htm">at-charset-071</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-072" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-11">
+          <a href="at-charset-072.htm">at-charset-072</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-073" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-5">
+          <a href="at-charset-073.htm">at-charset-073</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-074" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-6">
+          <a href="at-charset-074.htm">at-charset-074</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-075" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-7">
+          <a href="at-charset-075.htm">at-charset-075</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-076" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-8">
+          <a href="at-charset-076.htm">at-charset-076</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-077" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: KOI8-R">
+          <a href="at-charset-077.htm">at-charset-077</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-quotes-001" class="">
       <tr>
         <td rowspan="1" title="@charset quotes">
@@ -3584,6 +3944,54 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-import-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following a known but invalid @rule">
+          <a href="at-import-009.htm">at-import-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-import-010" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following an invalid selector">
+          <a href="at-import-010.htm">at-import-010</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-import-011" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following garbage">
+          <a href="at-import-011.htm">at-import-011</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-000" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-000.htm">at-keywords-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-001" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-001.htm">at-keywords-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-002.htm">at-keywords-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="at-rule-001" class="invalid">
       <tr>
         <td rowspan="1" title="Parser error handling with invalid at-rules: @ invalid selector">
@@ -3680,6 +4088,54 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="at-rule-013" class="invalid">
+      <tr>
+        <td rowspan="1" title="Ignoring at-rules inside @media blocks">
+          <a href="at-rule-013.htm">at-rule-013</a></td>
+        <td><a href="reference/at-rule-013-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-000.htm">at-rules-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-001" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-001.htm">at-rules-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-002" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-002.htm">at-rules-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-003" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-003.htm">at-rules-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-004" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-004.htm">at-rules-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="attribute-selector-001" class="">
       <tr>
         <td rowspan="1" title="ID selector without value and no matching element">
@@ -3696,6 +4152,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="attribute-token-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="[attr~=&quot;&quot;]Attribute Selectors with Empty String Values">
+          <a href="attribute-token-selector-002.htm">attribute-token-selector-002</a></td>
+        <td><a href="reference/attribute-token-selector-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="attribute-value-selector-004" class="invalid">
       <tr>
         <td rowspan="1" title="Numeric attributes">
@@ -7864,6 +8328,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.htm">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="bidi-005a" class="">
       <tr>
         <td rowspan="1" title="The bidi algorithm and inlines in CSS: embed levels and white-space: pre;">
@@ -9184,6 +9656,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="blocks-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Parsing nested blocks and strings in style blocks">
+          <a href="blocks-001.htm">blocks-001</a></td>
+        <td><a href="reference/blocks-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="blocks-002" class="">
       <tr>
         <td rowspan="1" title="Empty declaration block">
@@ -19492,6 +19972,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="c547-indent-000" class="ahem">
+      <tr>
+        <td rowspan="1" title="text-indent">
+          <a href="c547-indent-000.htm">c547-indent-000</a></td>
+        <td><a href="reference/c547-indent-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="c547-indent-001" class="">
       <tr>
         <td rowspan="1" title="text-indent">
@@ -19988,6 +20476,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="c5510-padn-000" class="ahem image">
+      <tr>
+        <td rowspan="1" title="padding">
+          <a href="c5510-padn-000.htm">c5510-padn-000</a></td>
+        <td><a href="reference/c5510-padn-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="c5510-padn-001" class="ahem">
       <tr>
         <td rowspan="1" title="padding">
@@ -20404,6 +20900,110 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="cascade-import-dynamic-001" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet append (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-001.htm">cascade-import-dynamic-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-002" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet append (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-002.htm">cascade-import-dynamic-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-003" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet insertion (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-003.htm">cascade-import-dynamic-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-004" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet insertion (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-004.htm">cascade-import-dynamic-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-005" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet deletion (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-005.htm">cascade-import-dynamic-005</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-006" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet deletion (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-006.htm">cascade-import-dynamic-006</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-control" class="">
+      <tr>
+        <td rowspan="1" title="Control test">
+          <a href="cascade-import-dynamic-control.htm">cascade-import-dynamic-control</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-000" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of Properties and Keywords (background)">
+          <a href="case-sensitive-000.htm">case-sensitive-000</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-001" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of At-rules (@media)">
+          <a href="case-sensitive-001.htm">case-sensitive-001</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-003" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of pseudo-classes and pseudo-elements">
+          <a href="case-sensitive-003.htm">case-sensitive-003</a></td>
+        <td><a href="reference/case-sensitive-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-004" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of :lang() arguments">
+          <a href="case-sensitive-004.htm">case-sensitive-004</a></td>
+        <td><a href="reference/case-sensitive-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-005" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of counter names">
+          <a href="case-sensitive-005.htm">case-sensitive-005</a></td>
+        <td><a href="reference/case-sensitive-005-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-006" class="HTMLonly">
+      <tr>
+        <td rowspan="1" title="Case sensitivity with element selectors">
+          <a href="case-sensitive-006.htm">case-sensitive-006</a></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="charset-attr-001" class="">
       <tr>
         <td rowspan="1" title="@charset test-attribute">
@@ -21156,6 +21756,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="color-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="RGB color syntax error handling">
+          <a href="color-000.htm">color-000</a></td>
+        <td><a href="reference/color-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="color-001" class="ahem invalid">
       <tr>
         <td rowspan="1" title="Color set to hex with 5 digits which is invalid and is equivalent to minimum minus one value for 6 digit hex">
@@ -22492,6 +23100,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="colors-006" class="">
+      <tr>
+        <td rowspan="1" title="Comparing color keywords and hex values">
+          <a href="colors-006.htm">colors-006</a></td>
+        <td><a href="reference/colors-006-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="colors-007" class="invalid">
       <tr>
         <td rowspan="1" title="Color keyword syntax">
@@ -22836,6 +23452,142 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="content-counter-000" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c)">
+          <a href="content-counter-000.htm">content-counter-000</a></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-001" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, none)">
+          <a href="content-counter-001.htm">content-counter-001</a></td>
+        <td><a href="reference/content-counter-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-002" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, disc)">
+          <a href="content-counter-002.htm">content-counter-002</a></td>
+        <td><a href="reference/content-counter-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-003" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, circle)">
+          <a href="content-counter-003.htm">content-counter-003</a></td>
+        <td><a href="reference/content-counter-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-004" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, square)">
+          <a href="content-counter-004.htm">content-counter-004</a></td>
+        <td><a href="reference/content-counter-004-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-005" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, decimal)">
+          <a href="content-counter-005.htm">content-counter-005</a></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-006" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, decimal-leading-zero)">
+          <a href="content-counter-006.htm">content-counter-006</a></td>
+        <td><a href="reference/content-counter-006-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-007" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-roman)">
+          <a href="content-counter-007.htm">content-counter-007</a></td>
+        <td><a href="reference/content-counter-007-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-008" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-roman)">
+          <a href="content-counter-008.htm">content-counter-008</a></td>
+        <td><a href="reference/content-counter-008-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-009" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, georgian)">
+          <a href="content-counter-009.htm">content-counter-009</a></td>
+        <td><a href="reference/content-counter-009-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-010" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, armenian)">
+          <a href="content-counter-010.htm">content-counter-010</a></td>
+        <td><a href="reference/content-counter-010-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-011" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-latin)">
+          <a href="content-counter-011.htm">content-counter-011</a></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-012" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-alpha)">
+          <a href="content-counter-012.htm">content-counter-012</a></td>
+        <td><a href="reference/content-counter-011-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-013" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-latin)">
+          <a href="content-counter-013.htm">content-counter-013</a></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-014" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-alpha)">
+          <a href="content-counter-014.htm">content-counter-014</a></td>
+        <td><a href="reference/content-counter-013-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-015" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-greek)">
+          <a href="content-counter-015.htm">content-counter-015</a></td>
+        <td><a href="reference/content-counter-015-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-016" class="invalid">
+      <tr>
+        <td rowspan="1" title="content: counter() error cases">
+          <a href="content-counter-016.htm">content-counter-016</a></td>
+        <td><a href="reference/content-counter-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="content-inherit-002" class="">
       <tr>
         <td rowspan="1" title="CSS inheritance: content with tables">
@@ -22860,6 +23612,70 @@
         <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
       </tr>
     </tbody>
+    <tbody id="core-syntax-001" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places">
+          <a href="core-syntax-001.htm">core-syntax-001</a></td>
+        <td><a href="reference/core-syntax-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-002" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places">
+          <a href="core-syntax-002.htm">core-syntax-002</a></td>
+        <td><a href="reference/core-syntax-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-003" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places (with no whitespace)">
+          <a href="core-syntax-003.htm">core-syntax-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-004" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places (with no whitespace)">
+          <a href="core-syntax-004.htm">core-syntax-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-006" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-006.htm">core-syntax-006</a></td>
+        <td><a href="reference/core-syntax-006-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-007" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-007.htm">core-syntax-007</a></td>
+        <td><a href="reference/core-syntax-007-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-008" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-008.htm">core-syntax-008</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-009" class="">
+      <tr>
+        <td rowspan="1" title="Syntactic White Space">
+          <a href="core-syntax-009.htm">core-syntax-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="counter-reset-increment-002" class="">
       <tr>
         <td rowspan="1" title="counter-reset - negative value with positive counter-increment">
@@ -22868,6 +23684,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="counters-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter functions with just the identifier">
+          <a href="counters-001.htm">counters-001</a></td>
+        <td><a href="reference/counters-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="counters-002" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid counter functions - Too many arguments">
@@ -22876,6 +23700,118 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="counters-003" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with no white space">
+          <a href="counters-003.htm">counters-003</a></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with no white space and two function values">
+          <a href="counters-004.htm">counters-004</a></td>
+        <td><a href="reference/counters-004-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-005" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with no white space and three function values">
+          <a href="counters-005.htm">counters-005</a></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-006" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with white space">
+          <a href="counters-006.htm">counters-006</a></td>
+        <td><a href="reference/counters-004-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-007" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with white space and two function values">
+          <a href="counters-007.htm">counters-007</a></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-008" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with white space and two function values">
+          <a href="counters-008.htm">counters-008</a></td>
+        <td><a href="reference/counters-004-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-009" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with white space and three function values">
+          <a href="counters-009.htm">counters-009</a></td>
+        <td><a href="reference/counters-003-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-010" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() functions">
+          <a href="counters-010.htm">counters-010</a></td>
+        <td><a href="reference/counters-010-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing ':', value, part 1">
+          <a href="declaration-001.htm">declaration-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing ':', value, part 2">
+          <a href="declaration-002.htm">declaration-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing value, part 1">
+          <a href="declaration-003.htm">declaration-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-004" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing value, part 2">
+          <a href="declaration-004.htm">declaration-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-005" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration: unexpected tokens { }, part 1">
+          <a href="declaration-005.htm">declaration-005</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-006" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration: unexpected tokens { }, part 2">
+          <a href="declaration-006.htm">declaration-006</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="declaration-whitespace-001" class="">
       <tr>
         <td rowspan="1" title="Parsing white space in style declaration">
@@ -22884,6 +23820,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="declarations-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="Ignoring at-rules inside declaration blocks">
+          <a href="declarations-009.htm">declarations-009</a></td>
+        <td><a href="reference/declarations-009-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="default-attribute-selector-001" class="">
       <tr>
         <td rowspan="1" title="attribute selector - Default attribute values in DTDs">
@@ -23580,6 +24524,134 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="escaped-newline-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing strings with escaped newlines">
+          <a href="escaped-newline-001.htm">escaped-newline-001</a></td>
+        <td><a href="reference/escaped-newline-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-000" class="">
+      <tr>
+        <td rowspan="1" title="Escaped Newline in String">
+          <a href="escapes-000.htm">escapes-000</a></td>
+        <td><a href="reference/escapes-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-001" class="">
+      <tr>
+        <td rowspan="1" title="Escaped Quote Marks in String">
+          <a href="escapes-001.htm">escapes-001</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-002" class="">
+      <tr>
+        <td rowspan="1" title="Invalid Punctuation Escapes">
+          <a href="escapes-002.htm">escapes-002</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-003" class="">
+      <tr>
+        <td rowspan="1" title="Class and Keyword Letter Escapes">
+          <a href="escapes-003.htm">escapes-003</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-004" class="">
+      <tr>
+        <td rowspan="1" title="Unicode Escapes">
+          <a href="escapes-004.htm">escapes-004</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-005" class="">
+      <tr>
+        <td rowspan="1" title="Unicode Escapes and Case Insensitivity">
+          <a href="escapes-005.htm">escapes-005</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-006" class="">
+      <tr>
+        <td rowspan="1" title="Incorrect Letter Escape (Class Selector)">
+          <a href="escapes-006.htm">escapes-006</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-007" class="">
+      <tr>
+        <td rowspan="1" title="Space-terminated Unicode Escapes">
+          <a href="escapes-007.htm">escapes-007</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-008" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Space-terminated Character Escapes">
+          <a href="escapes-008.htm">escapes-008</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="Characters and case: Escaping a character inside a keyword">
+          <a href="escapes-009.htm">escapes-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-010" class="invalid">
+      <tr>
+        <td rowspan="1" title="Unicode-escaped Braces">
+          <a href="escapes-010.htm">escapes-010</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-011" class="">
+      <tr>
+        <td rowspan="1" title="CSS Parsing: Escaped keywords">
+          <a href="escapes-011.htm">escapes-011</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-012" class="">
+      <tr>
+        <td rowspan="1" title="CSS Parsing: Escaped keywords">
+          <a href="escapes-012.htm">escapes-012</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-013" class="">
+      <tr>
+        <td rowspan="1" title="Escaping and spaces with classes">
+          <a href="escapes-013.htm">escapes-013</a></td>
+        <td><a href="reference/escapes-013-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-014" class="">
+      <tr>
+        <td rowspan="1" title="Escaping and spaces with declarations">
+          <a href="escapes-014.htm">escapes-014</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="escapes-015" class="invalid">
       <tr>
         <td rowspan="1" title="Escape of non-printable characters within declarations, applying to property values">
@@ -25948,6 +27020,38 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="font-family-invalid-characters-003" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid curly brackets and pair matching">
+          <a href="font-family-invalid-characters-003.htm">font-family-invalid-characters-003</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-004" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid square brackets and pair matching">
+          <a href="font-family-invalid-characters-004.htm">font-family-invalid-characters-004</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-005" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid quotes and pair matching">
+          <a href="font-family-invalid-characters-005.htm">font-family-invalid-characters-005</a></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.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>
+    <tbody id="font-family-invalid-characters-006" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid single quotes and pair matching">
+          <a href="font-family-invalid-characters-006.htm">font-family-invalid-characters-006</a></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.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>
     <tbody id="font-family-name-001" class="font">
       <tr>
         <td rowspan="1" title="font family name with no quotes">
@@ -27692,6 +28796,118 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="ident-000" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (a-z) as Classes and IDs">
+          <a href="ident-000.htm">ident-000</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-001" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs">
+          <a href="ident-001.htm">ident-001</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-002" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with _) as Classes and IDs">
+          <a href="ident-002.htm">ident-002</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with -) as Classes and IDs">
+          <a href="ident-003.htm">ident-003</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-004" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with ideographic) as Classes and IDs">
+          <a href="ident-004.htm">ident-004</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-005" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including ideographic) as Classes and IDs">
+          <a href="ident-005.htm">ident-005</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-006" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escape) as Classes and IDs">
+          <a href="ident-006.htm">ident-006</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-007" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including escape) as Classes and IDs">
+          <a href="ident-007.htm">ident-007</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-008" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Identifiers (starting with digit) as Classes and IDs">
+          <a href="ident-008.htm">ident-008</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-009" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including digits) as Classes and IDs">
+          <a href="ident-009.htm">ident-009</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-010" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escape) as Classes and IDs">
+          <a href="ident-010.htm">ident-010</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-011" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including escapes) as Classes and IDs">
+          <a href="ident-011.htm">ident-011</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-012" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs">
+          <a href="ident-012.htm">ident-012</a></td>
+        <td><a href="reference/ident-012-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-013" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escaped -) as Classes and IDs">
+          <a href="ident-013.htm">ident-013</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="ident-014" class="">
       <tr>
         <td rowspan="1" title="Selector attributes and hyphens">
@@ -27740,6 +28956,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="ident-020" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Identifiers (starting with double -) as Classes and IDs">
+          <a href="ident-020.htm">ident-020</a></td>
+        <td><a href="reference/ident-000-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="ignored-rules-001" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid rules that precede good rules">
@@ -27796,6 +29020,22 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="import-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="import-000.htm">import-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="import-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="import-001.htm">import-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="inherit-static-offset-001" class="image">
       <tr>
         <td rowspan="1" title="top and left - inherit keyword on element with statically positioned parent">
@@ -28884,6 +30124,22 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="keywords-000" class="">
+      <tr>
+        <td rowspan="1" title="Keywords v. Strings (background)">
+          <a href="keywords-000.htm">keywords-000</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="keywords-001" class="">
+      <tr>
+        <td rowspan="1" title="Keywords v. Strings (width)">
+          <a href="keywords-001.htm">keywords-001</a></td>
+        <td><a href="reference/keywords-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="lang-selector-002" class="invalid">
       <tr>
         <td rowspan="1" title="Empty :lang selector">
@@ -30108,6 +31364,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="list-style-020" class="">
+      <tr>
+        <td rowspan="1" title="'list-style' shorthand and 'none' values">
+          <a href="list-style-020.htm">list-style-020</a></td>
+        <td><a href="reference/list-style-020-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="list-style-021" class="image">
       <tr>
         <td rowspan="1" title="list-style: none - followed by a list-style-image reset">
@@ -33124,6 +34388,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="matching-brackets-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for @rules">
+          <a href="matching-brackets-001.htm">matching-brackets-001</a></td>
+        <td><a href="reference/matching-brackets-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="matching-brackets-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for declarations">
+          <a href="matching-brackets-002.htm">matching-brackets-002</a></td>
+        <td><a href="reference/matching-brackets-002-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="matching-brackets-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for selectors">
+          <a href="matching-brackets-003.htm">matching-brackets-003</a></td>
+        <td><a href="reference/matching-brackets-001-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="max-height-001" class="invalid">
       <tr>
         <td rowspan="1" title="Max-height using pixels with a minimum minus one value, -1px">
@@ -36196,6 +37484,14 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing integer numbers with '+'">
+          <a href="numbers-units-004.htm">numbers-units-004</a></td>
+        <td><a href="reference/ref-filled-black-96px-square.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="numbers-units-005" class="">
       <tr>
         <td rowspan="1" title="Optional unit identifier after 0">
@@ -36204,6 +37500,73 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-006" class="invalid">
+      <tr>
+        <td rowspan="1" title="Unsupported negative values">
+          <a href="numbers-units-006.htm">numbers-units-006</a></td>
+        <td><a href="reference/ref-filled-black-96px-square.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-007" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em sizes">
+          <a href="numbers-units-007.htm">numbers-units-007</a></td>
+        <td><a href="reference/numbers-units-007-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-009" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with the font-size set to px size">
+          <a href="numbers-units-009.htm">numbers-units-009</a></td>
+        <td><a href="reference/numbers-units-009-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-010" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to inch">
+          <a href="numbers-units-010.htm">numbers-units-010</a></td>
+        <td><a href="reference/numbers-units-010-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-011" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to em">
+          <a href="numbers-units-011.htm">numbers-units-011</a></td>
+        <td><a href="reference/numbers-units-011-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-012" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to ex">
+          <a href="numbers-units-012.htm">numbers-units-012</a></td>
+        <td><a href="reference/numbers-units-012-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-013" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to percentage">
+          <a href="numbers-units-013.htm">numbers-units-013</a></td>
+        <td><a href="reference/numbers-units-013-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-015" class="ahem should">
+      <tr>
+        <td rowspan="2" title="Height of EX">
+          <a href="numbers-units-015.htm">numbers-units-015</a></td>
+        <td><a href="reference/numbers-units-014-ref-a.htm">=</a> </td>
+        <td rowspan="2"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="should" title="Behavior tested is recommended but not required">Recommend</abbr></td>
+      </tr>
+      <tr>
+        <td><a href="reference/numbers-units-014-ref-a.htm">=</a></td>
+      </tr>
+    </tbody>
     <tbody id="numbers-units-016" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid percentage values - decimal value with multiple decimals">
@@ -36220,6 +37583,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-018" class="ahem">
+      <tr>
+        <td rowspan="1" title="Specifying em/ex on the root element">
+          <a href="numbers-units-018.htm">numbers-units-018</a></td>
+        <td><a href="reference/numbers-units-018-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-019" class="ahem">
+      <tr>
+        <td rowspan="1" title="First available font defines the 'ex' unit size">
+          <a href="numbers-units-019.htm">numbers-units-019</a></td>
+        <td><a href="reference/numbers-units-019-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-021" class="96dpi ahem">
+      <tr>
+        <td rowspan="1" title="Root element and the 'em' unit size">
+          <a href="numbers-units-021.htm">numbers-units-021</a></td>
+        <td><a href="reference/numbers-units-021-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="96dpi" title="Only valid on 96dpi displays">96</abbr><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="other-attribute-001" class="">
       <tr>
         <td rowspan="1" title="Function 'attr()' referencing another elements attribute data">
@@ -39972,6 +41359,38 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="quoted-string-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of single quotes inside double quotes">
+          <a href="quoted-string-001.htm">quoted-string-001</a></td>
+        <td><a href="reference/quoted-string-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-002" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of double quotes inside single quotes">
+          <a href="quoted-string-002.htm">quoted-string-002</a></td>
+        <td><a href="reference/quoted-string-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-003" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of escaped quotes (single within single)">
+          <a href="quoted-string-003.htm">quoted-string-003</a></td>
+        <td><a href="reference/quoted-string-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of escaped double quotes">
+          <a href="quoted-string-004.htm">quoted-string-004</a></td>
+        <td><a href="reference/quoted-string-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="quotes-035" class="should">
       <tr>
         <td rowspan="1" title="CSS and Quotes: Counting Right (Slightly Simpler Version)">
@@ -41700,6 +43119,14 @@
         <td rowspan="1"><abbr class="dom" title="Requires Document Object Model support">DOM/JS</abbr></td>
       </tr>
     </tbody>
+    <tbody id="selectors-parsing-001" class="">
+      <tr>
+        <td rowspan="1" title="CSS: Selector Parsing and Invalid Pseudo-Elements">
+          <a href="selectors-parsing-001.htm">selectors-parsing-001</a></td>
+        <td><a href="reference/selectors-parsing-001-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="separated-border-model-003a" class="">
       <tr>
         <td rowspan="1" title="table width as set when greater than sum of columns width">
@@ -41780,6 +43207,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="sgml-comments-000" class="">
+      <tr>
+        <td rowspan="1" title="SGML comments">
+          <a href="sgml-comments-000.htm">sgml-comments-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="sgml-comments-001" class="">
       <tr>
         <td rowspan="1" title="Parsing SGML comments">
@@ -41788,6 +43223,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="sgml-comments-002" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of CDO/CDC in stylesheets">
+          <a href="sgml-comments-002.htm">sgml-comments-002</a></td>
+        <td><a href="reference/sgml-comments-002-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="shand-border-000" class="">
       <tr>
         <td rowspan="1" title="Shorthand Properties (border)">
@@ -41964,6 +43407,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="strings-000" class="">
+      <tr>
+        <td rowspan="1" title="Newlines in strings">
+          <a href="strings-000.htm">strings-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="style-attr-cascade-001" class="">
       <tr>
         <td rowspan="1" title="CSS: style attributes vs. important tag selector">
@@ -43260,6 +44711,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="units-005" class="">
+      <tr>
+        <td rowspan="1" title="Units: em (0.87em floats)">
+          <a href="units-005.htm">units-005</a></td>
+        <td><a href="reference/units-005-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="units-006" class="ahem">
       <tr>
         <td rowspan="1" title="Units: px and font-size">
@@ -43300,6 +44759,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="unterminated-string-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Error handling of unterminated strings">
+          <a href="unterminated-string-001.htm">unterminated-string-001</a></td>
+        <td><a href="reference/filler-text-below-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-001" class="">
       <tr>
         <td rowspan="1" title="Parsing valid URIs with white space and no quotes">
@@ -43324,6 +44791,22 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-004" class="image">
+      <tr>
+        <td rowspan="1" title="URL function with URI that has escaped special chars">
+          <a href="uri-004.htm">uri-004</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-005" class="image">
+      <tr>
+        <td rowspan="1" title="URL function with escaped special chars - single quote">
+          <a href="uri-005.htm">uri-005</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-006" class="image invalid">
       <tr>
         <td rowspan="1" title="Invalid character (*) after URL function values">
@@ -43372,6 +44855,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-012" class="invalid">
+      <tr>
+        <td rowspan="1" title="Error handling of broken url() - balancing braces">
+          <a href="uri-012.htm">uri-012</a></td>
+        <td><a href="reference/uri-012-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-013" class="invalid">
       <tr>
         <td rowspan="1" title="handling of invalid url() functions">
@@ -43380,6 +44871,46 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-014" class="">
+      <tr>
+        <td rowspan="1" title="Unquoted commas in url()">
+          <a href="uri-014.htm">uri-014</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-015" class="">
+      <tr>
+        <td rowspan="1" title="Escaped url() functional notation">
+          <a href="uri-015.htm">uri-015</a></td>
+        <td><a href="reference/ref-green-background.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-016" class="">
+      <tr>
+        <td rowspan="1" title="Error handling of broken url() with open /*">
+          <a href="uri-016.htm">uri-016</a></td>
+        <td><a href="reference/uri-016-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-017" class="image invalid">
+      <tr>
+        <td rowspan="1" title="Unclosed URI Token at EOF (in declaration)">
+          <a href="uri-017.htm">uri-017</a></td>
+        <td><a href="reference/uri-017-ref.htm">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-018" class="image invalid">
+      <tr>
+        <td rowspan="1" title="Unclosed URI Token at EOF (in @import)">
+          <a href="uri-018.htm">uri-018</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="vertical-align-004" class="ahem">
       <tr>
         <td rowspan="1" title="Vertical-align using pixels with a negative zero value, -0px">
@@ -44204,6 +45735,22 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="whitespace-001" class="">
+      <tr>
+        <td rowspan="1" title="White space - em-space (U+2003)">
+          <a href="whitespace-001.htm">whitespace-001</a></td>
+        <td><a href="reference/no-red-filler-text-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="whitespace-002" class="">
+      <tr>
+        <td rowspan="1" title="White space - ideographic space (U+3000)">
+          <a href="whitespace-002.htm">whitespace-002</a></td>
+        <td><a href="reference/no-red-filler-text-ref.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="width-001" class="invalid">
       <tr>
         <td rowspan="1" title="Width using pixels with a minimum minus one value, -1px">
diff --git a/tests/wpt/css-tests/css21_dev/html4/reftest.list b/tests/wpt/css-tests/css21_dev/html4/reftest.list
index a751955b575..23206cbc6f0 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/html4/reftest.list
@@ -443,21 +443,66 @@ anonymous-boxes-001b.htm == reference/anonymous-boxes-001b-ref.htm
 anonymous-boxes-inheritance-001.htm == reference/anonymous-boxes-inheritance-001-ref.htm
 anonymous-inline-whitespace-001.htm == reference/ref-if-there-is-no-red.htm
 anonymous-table-box-width-001.htm == reference/ref-filled-green-100px-square.htm
+at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-002.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-003.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-004.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-005.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-006.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-007.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-008.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-009.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-010.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-011.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-012.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-014.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-015.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-016.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-019.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-020.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-021.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-024.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-025.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-026.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-027.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-028.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-029.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-030.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
 at-charset-033.htm == reference/filler-text-below-green.htm
 at-charset-034.htm == reference/filler-text-below-green.htm
 at-charset-035.htm == reference/filler-text-below-green.htm
 at-charset-036.htm == reference/filler-text-below-green.htm
 at-charset-037.htm == reference/filler-text-below-green.htm
 at-charset-038.htm == reference/filler-text-below-green.htm
+at-charset-040.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-041.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-042.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-043.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-044.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-045.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-046.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-047.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-048.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
 at-charset-049.htm == reference/filler-text-below-green.htm
 at-charset-050.htm == reference/filler-text-below-green.htm
 at-charset-051.htm == reference/filler-text-below-green.htm
 at-charset-052.htm == reference/filler-text-below-green.htm
 at-charset-053.htm == reference/filler-text-below-green.htm
+at-charset-054.htm == reference/filler-text-below-green.htm
 at-charset-055.htm == reference/filler-text-below-green.htm
+at-charset-056.htm == reference/filler-text-below-green.htm
 at-charset-057.htm == reference/filler-text-below-green.htm
 at-charset-058.htm == reference/filler-text-below-green.htm
 at-charset-059.htm == reference/filler-text-below-green.htm
+at-charset-060.htm == at-charset-001.htm == reference/at-charset-001-ref.htm
+at-charset-061.htm == reference/filler-text-below-green.htm
+at-charset-071.htm == reference/ref-green-background.htm
+at-charset-072.htm == reference/ref-green-background.htm
+at-charset-073.htm == reference/ref-green-background.htm
+at-charset-074.htm == reference/ref-green-background.htm
+at-charset-075.htm == reference/ref-green-background.htm
+at-charset-076.htm == reference/ref-green-background.htm
+at-charset-077.htm == reference/ref-green-background.htm
 at-charset-quotes-001.htm == reference/at-charset-ref.htm
 at-charset-space-001.htm == reference/at-charset-ref.htm
 at-charset-space-002.htm == reference/at-charset-ref.htm
@@ -473,6 +518,12 @@ at-import-004.htm == reference/no-red-filler-text-ref.htm
 at-import-005.htm == reference/filler-text-below-green.htm
 at-import-006.htm == reference/filler-text-below-green.htm
 at-import-007.htm == reference/filler-text-below-green.htm
+at-import-009.htm == reference/ref-this-text-should-be-green.htm
+at-import-010.htm == reference/ref-this-text-should-be-green.htm
+at-import-011.htm == reference/ref-this-text-should-be-green.htm
+at-keywords-000.htm == reference/ref-this-text-should-be-green.htm
+at-keywords-001.htm == reference/ref-this-text-should-be-green.htm
+at-keywords-002.htm == reference/ref-this-text-should-be-green.htm
 at-rule-001.htm == reference/filler-text-below-green.htm
 at-rule-002.htm == reference/filler-text-below-green.htm
 at-rule-003.htm == reference/filler-text-below-green.htm
@@ -485,8 +536,15 @@ at-rule-009.htm == reference/filler-text-below-green.htm
 at-rule-010.htm == reference/filler-text-below-green.htm
 at-rule-011.htm == reference/filler-text-below-green.htm
 at-rule-012.htm == reference/filler-text-below-green.htm
+at-rule-013.htm == reference/at-rule-013-ref.htm
+at-rules-000.htm == reference/ref-this-text-should-be-green.htm
+at-rules-001.htm == reference/ref-this-text-should-be-green.htm
+at-rules-002.htm == reference/ref-this-text-should-be-green.htm
+at-rules-003.htm == reference/ref-this-text-should-be-green.htm
+at-rules-004.htm == reference/ref-this-text-should-be-green.htm
 attribute-selector-001.htm == reference/no-red-filler-text-ref.htm
 attribute-selector-002.htm == reference/filler-text-below-green.htm
+attribute-token-selector-002.htm == reference/attribute-token-selector-002-ref.htm
 attribute-value-selector-004.htm == reference/no-red-filler-text-ref.htm
 attribute-value-selector-005.htm == reference/filler-text-below-green.htm
 attribute-value-selector-006.htm == reference/filler-text-below-green.htm
@@ -1013,6 +1071,7 @@ before-content-display-018.htm == reference/after-content-display-001-ref.htm
 bidi-001.htm == reference/bidi-001-ref.htm
 bidi-002.htm == reference/bidi-002-ref.htm
 bidi-003.htm == reference/bidi-003-ref.htm
+bidi-004.htm == reference/bidi-004-ref.htm
 bidi-005a.htm == reference/bidi-005a-ref.htm
 bidi-005b.htm == reference/bidi-005b-ref.htm
 bidi-006a.htm == reference/bidi-005a-ref.htm
@@ -1180,6 +1239,7 @@ block-replaced-height-006.htm == reference/block-replaced-height-006-ref.htm
 block-replaced-height-007.htm == reference/block-replaced-height-004-ref.htm
 block-replaced-width-002.htm == reference/block-replaced-width-002-ref.htm
 block-replaced-width-006.htm == reference/block-replaced-width-006-ref.htm
+blocks-001.htm == reference/blocks-001-ref.htm
 blocks-002.htm == reference/filler-text-below-green.htm
 blocks-003.htm == reference/filler-text-below-green.htm
 blocks-004.htm == reference/no-red-filler-text-ref.htm
@@ -2471,6 +2531,7 @@ c541-word-sp-001.htm == reference/c541-word-sp-001-ref.htm
 c542-letter-sp-000.htm == reference/c542-letter-sp-000-ref.htm
 c542-letter-sp-001.htm == reference/c542-letter-sp-001-ref.htm
 c544-valgn-001.htm == reference/c544-valgn-001-ref.htm
+c547-indent-000.htm == reference/c547-indent-000-ref.htm
 c547-indent-001.htm == reference/c547-indent-001-ref.htm
 c548-leadin-000.htm == reference/c548-leadin-000-ref.htm
 c548-ln-ht-000.htm == reference/c548-ln-ht-000-ref.htm
@@ -2533,6 +2594,7 @@ c5509-padn-l-001.htm == reference/c5509-padn-l-001-ref.htm
 c5509-padn-l-002.htm == reference/c5509-padn-l-002-ref.htm
 c5509-padn-l-003.htm == reference/c5509-padn-l-003-ref.htm
 c5510-ipadn-000.htm == reference/c5510-ipadn-000-ref.htm
+c5510-padn-000.htm == reference/c5510-padn-000-ref.htm
 c5510-padn-001.htm == reference/c5510-padn-001-ref.htm
 c5510-padn-002.htm == reference/c5510-padn-002-ref.htm
 c5511-brdr-tw-001.htm == reference/c5511-brdr-tw-001-ref.htm
@@ -2585,6 +2647,20 @@ cascade-009.htm == reference/filler-text-below-green.htm
 cascade-009a.htm == reference/cascade-009a-ref.htm
 cascade-009b.htm == reference/cascade-009b-ref.htm
 cascade-012.htm == reference/cascade-012-ref.htm
+cascade-import-dynamic-001.htm == reference/ref-this-text-should-be-green.htm
+cascade-import-dynamic-002.htm == reference/ref-this-text-should-be-green.htm
+cascade-import-dynamic-003.htm == reference/ref-this-text-should-be-green.htm
+cascade-import-dynamic-004.htm == reference/ref-this-text-should-be-green.htm
+cascade-import-dynamic-005.htm == reference/ref-this-text-should-be-green.htm
+cascade-import-dynamic-006.htm == reference/ref-this-text-should-be-green.htm
+cascade-import-dynamic-control.htm == reference/ref-this-text-should-be-green.htm
+case-sensitive-000.htm == reference/ref-green-background.htm
+case-sensitive-001.htm == reference/ref-green-background.htm
+case-sensitive-003.htm == reference/case-sensitive-003-ref.htm
+case-sensitive-004.htm == reference/case-sensitive-003-ref.htm
+case-sensitive-005.htm == reference/case-sensitive-005-ref.htm
+case-sensitive-006.htm == reference/filler-text-below-green.htm
+case-sensitive-007.htm == reference/no-red-filler-text-ref.htm
 charset-attr-001.htm == reference/at-charset-ref.htm
 class-selector-001.htm == reference/no-red-filler-text-ref.htm
 class-selector-002.htm == reference/filler-text-below-green.htm
@@ -2679,6 +2755,7 @@ clip-099.htm == reference/no-red-on-blank-page-ref.htm
 clip-102.htm == reference/no-red-on-blank-page-ref.htm
 collapsing-border-model-010a.htm == reference/ref-filled-green-100px-square.htm
 collapsing-border-model-010b.htm == reference/ref-filled-green-100px-square.htm
+color-000.htm == reference/color-000-ref.htm
 color-001.htm == reference/color-001-ref.htm
 color-002.htm == reference/color-002-ref.htm
 color-003.htm == reference/color-003-ref.htm
@@ -2846,6 +2923,7 @@ colors-002.htm == reference/no-red-filler-text-ref.htm
 colors-003.htm == reference/no-red-filler-text-ref.htm
 colors-004.htm == reference/no-red-filler-text-ref.htm
 colors-005.htm == reference/filler-text-below-green.htm
+colors-006.htm == reference/colors-006-ref.htm
 colors-007.htm == reference/colors-007-ref.htm
 column-visibility-004.htm == reference/column-visibility-004-ref.htm
 combinator-001.htm == reference/filler-text-below-green.htm
@@ -2889,12 +2967,53 @@ content-173.htm == reference/content-173-ref.htm
 content-174.htm == reference/content-174-ref.htm
 content-175.htm == reference/content-175-ref.htm
 content-177.htm == reference/content-177-ref.htm
+content-counter-000.htm == reference/content-counter-000-ref.htm
+content-counter-001.htm == reference/content-counter-001-ref.htm
+content-counter-002.htm == reference/content-counter-002-ref.htm
+content-counter-003.htm == reference/content-counter-003-ref.htm
+content-counter-004.htm == reference/content-counter-004-ref.htm
+content-counter-005.htm == reference/content-counter-000-ref.htm
+content-counter-006.htm == reference/content-counter-006-ref.htm
+content-counter-007.htm == reference/content-counter-007-ref.htm
+content-counter-008.htm == reference/content-counter-008-ref.htm
+content-counter-009.htm == reference/content-counter-009-ref.htm
+content-counter-010.htm == reference/content-counter-010-ref.htm
+content-counter-011.htm == reference/content-counter-011-ref.htm
+content-counter-012.htm == reference/content-counter-011-ref.htm
+content-counter-013.htm == reference/content-counter-013-ref.htm
+content-counter-014.htm == reference/content-counter-013-ref.htm
+content-counter-015.htm == reference/content-counter-015-ref.htm
+content-counter-016.htm == reference/content-counter-000-ref.htm
 content-inherit-002.htm == reference/content-inherit-002-ref.htm
 content-type-000.htm == reference/content-type-000-ref.htm
 content-type-001.htm == reference/content-type-000-ref.htm
+core-syntax-001.htm == reference/core-syntax-001-ref.htm
+core-syntax-002.htm == reference/core-syntax-002-ref.htm
+core-syntax-003.htm == reference/ref-this-text-should-be-green.htm
+core-syntax-004.htm == reference/ref-this-text-should-be-green.htm
+core-syntax-006.htm == reference/core-syntax-006-ref.htm
+core-syntax-007.htm == reference/core-syntax-007-ref.htm
+core-syntax-008.htm == reference/ref-this-text-should-be-green.htm
+core-syntax-009.htm == reference/ref-this-text-should-be-green.htm
 counter-reset-increment-002.htm == reference/counter-reset-increment-002-ref.htm
+counters-001.htm == reference/counters-001-ref.htm
 counters-002.htm == reference/no-red-filler-text-ref.htm
+counters-003.htm == reference/counters-003-ref.htm
+counters-004.htm == reference/counters-004-ref.htm
+counters-005.htm == reference/counters-003-ref.htm
+counters-006.htm == reference/counters-004-ref.htm
+counters-007.htm == reference/counters-003-ref.htm
+counters-008.htm == reference/counters-004-ref.htm
+counters-009.htm == reference/counters-003-ref.htm
+counters-010.htm == reference/counters-010-ref.htm
+declaration-001.htm == reference/ref-this-text-should-be-green.htm
+declaration-002.htm == reference/ref-this-text-should-be-green.htm
+declaration-003.htm == reference/ref-this-text-should-be-green.htm
+declaration-004.htm == reference/ref-this-text-should-be-green.htm
+declaration-005.htm == reference/ref-this-text-should-be-green.htm
+declaration-006.htm == reference/ref-this-text-should-be-green.htm
 declaration-whitespace-001.htm == reference/filler-text-below-green.htm
+declarations-009.htm == reference/declarations-009-ref.htm
 default-attribute-selector-001.htm == reference/ref-filled-green-100px-square.htm
 default-attribute-selector-002.htm == reference/ref-filled-green-100px-square.htm
 default-attribute-selector-003.htm == reference/ref-filled-green-100px-square.htm
@@ -2982,6 +3101,22 @@ escaped-ident-spaces-004.htm == reference/filler-text-below-green.htm
 escaped-ident-spaces-005.htm == reference/filler-text-below-green.htm
 escaped-ident-spaces-006.htm == reference/filler-text-below-green.htm
 escaped-ident-spaces-007.htm == reference/filler-text-below-green.htm
+escaped-newline-001.htm == reference/escaped-newline-001-ref.htm
+escapes-000.htm == reference/escapes-000-ref.htm
+escapes-001.htm == reference/ref-green-background.htm
+escapes-002.htm == reference/ref-green-background.htm
+escapes-003.htm == reference/ref-green-background.htm
+escapes-004.htm == reference/ref-green-background.htm
+escapes-005.htm == reference/ref-green-background.htm
+escapes-006.htm == reference/ref-green-background.htm
+escapes-007.htm == reference/ref-green-background.htm
+escapes-008.htm == reference/ref-green-background.htm
+escapes-009.htm == reference/ref-this-text-should-be-green.htm
+escapes-010.htm == reference/ref-this-text-should-be-green.htm
+escapes-011.htm == reference/ref-this-text-should-be-green.htm
+escapes-012.htm == reference/ref-this-text-should-be-green.htm
+escapes-013.htm == reference/escapes-013-ref.htm
+escapes-014.htm == reference/ref-green-background.htm
 escapes-015.htm == reference/ref-if-there-is-no-red.htm
 escapes-016.htm == reference/ref-if-there-is-no-red.htm
 extract-ordered-lists-in-regions-explicit-counters-002.htm == reference/extract-ordered-lists-in-regions-explicit-counters-002-ref.htm
@@ -3282,6 +3417,10 @@ font-family-applies-to-016.htm == reference/ref-if-there-is-no-red.htm
 font-family-applies-to-017.htm == reference/font-family-applies-to-001-ref.htm
 font-family-invalid-characters-001.htm == reference/font-family-invalid-characters-001-ref.htm
 font-family-invalid-characters-002.htm == reference/font-family-invalid-characters-002-ref.htm
+font-family-invalid-characters-003.htm == reference/font-family-invalid-characters-002-ref.htm
+font-family-invalid-characters-004.htm == reference/font-family-invalid-characters-002-ref.htm
+font-family-invalid-characters-005.htm == reference/font-family-invalid-characters-005-ref.htm
+font-family-invalid-characters-006.htm == reference/font-family-invalid-characters-006-ref.htm
 font-family-name-001.htm == reference/font-family-name-ref.htm
 font-family-name-002.htm == reference/font-family-name-ref.htm
 font-family-name-003.htm == reference/font-family-name-ref.htm
@@ -3500,12 +3639,27 @@ id-selector-001.htm == reference/filler-text-below-green.htm
 id-selector-004.htm == reference/no-red-filler-text-ref.htm
 id-selector-005.htm == reference/no-red-filler-text-ref.htm
 id-selector-006.htm == reference/filler-text-below-green.htm
+ident-000.htm == reference/ident-000-ref.htm
+ident-001.htm == reference/ident-000-ref.htm
+ident-002.htm == reference/ident-000-ref.htm
+ident-003.htm == reference/ident-000-ref.htm
+ident-004.htm == reference/ident-000-ref.htm
+ident-005.htm == reference/ident-000-ref.htm
+ident-006.htm == reference/ident-000-ref.htm
+ident-007.htm == reference/ident-000-ref.htm
+ident-008.htm == reference/ident-000-ref.htm
+ident-009.htm == reference/ident-000-ref.htm
+ident-010.htm == reference/ident-000-ref.htm
+ident-011.htm == reference/ident-000-ref.htm
+ident-012.htm == reference/ident-012-ref.htm
+ident-013.htm == reference/ident-000-ref.htm
 ident-014.htm == reference/filler-text-below-green.htm
 ident-015.htm == reference/filler-text-below-green.htm
 ident-016.htm == reference/filler-text-below-green.htm
 ident-017.htm == reference/no-red-filler-text-ref.htm
 ident-018.htm == reference/no-red-filler-text-ref.htm
 ident-019.htm == reference/filler-text-below-green.htm
+ident-020.htm == reference/ident-000-ref.htm
 ignored-rules-001.htm == reference/filler-text-below-green.htm
 ignored-rules-002.htm == reference/filler-text-below-green.htm
 ignored-rules-003.htm == reference/filler-text-below-green.htm
@@ -3513,6 +3667,8 @@ ignored-rules-004.htm == reference/filler-text-below-green.htm
 ignored-rules-005.htm == reference/filler-text-below-green.htm
 ignored-rules-006.htm == reference/filler-text-below-green.htm
 ignored-rules-007.htm == reference/filler-text-below-green.htm
+import-000.htm == reference/ref-this-text-should-be-green.htm
+import-001.htm == reference/ref-this-text-should-be-green.htm
 inherit-static-offset-001.htm == reference/ref-filled-green-100px-square.htm
 inherit-static-offset-002.htm == reference/ref-filled-green-100px-square.htm
 inherit-static-offset-003.htm == reference/ref-filled-green-100px-square.htm
@@ -3661,6 +3817,8 @@ insert-inline-in-blocks-n-inlines-middle-003.htm == reference/insert-inline-in-b
 invalid-at-rule-001.htm == reference/no-red-filler-text-ref.htm
 invalid-decl-at-rule-001.htm == reference/filler-text-below-green.htm
 invalid-decl-at-rule-002.htm == reference/filler-text-below-green.htm
+keywords-000.htm == reference/ref-green-background.htm
+keywords-001.htm == reference/keywords-001-ref.htm
 lang-selector-002.htm == reference/no-red-filler-text-ref.htm
 lang-selector-003.htm == reference/filler-text-below-green.htm
 leading-001.htm == reference/leading-001-ref.htm
@@ -3814,6 +3972,7 @@ line-height-applies-to-016.htm == reference/line-height-applies-to-016-ref.htm
 line-height-bleed-001.htm == reference/line-height-bleed-001-ref.htm
 line-height-bleed-002.htm == reference/line-height-bleed-002-ref.htm
 list-style-019.htm == reference/list-style-019-ref.htm
+list-style-020.htm == reference/list-style-020-ref.htm
 list-style-021.htm == reference/list-style-021-ref.htm
 list-style-image-004.htm == reference/list-style-image-004-ref.htm
 list-style-image-005.htm == reference/list-style-image-005-ref.htm
@@ -4191,6 +4350,9 @@ margin-top-applies-to-012.htm == reference/margin-top-applies-to-012-ref.htm
 margin-top-applies-to-013.htm == reference/margin-top-applies-to-013-ref.htm
 margin-top-applies-to-014.htm == reference/margin-top-applies-to-013-ref.htm
 margin-top-applies-to-015.htm == reference/margin-top-applies-to-013-ref.htm
+matching-brackets-001.htm == reference/matching-brackets-001-ref.htm
+matching-brackets-002.htm == reference/matching-brackets-002-ref.htm
+matching-brackets-003.htm == reference/matching-brackets-001-ref.htm
 max-height-001.htm == reference/ref-filled-black-96px-square.htm
 max-height-002.htm == reference/height-001-ref.htm
 max-height-003.htm == reference/height-003-ref.htm
@@ -4575,9 +4737,22 @@ moz-multicol3-column-balancing-break-inside-avoid-1.htm == reference/moz-multico
 multicol-height-002.htm == reference/multicol-height-002.htm
 numbers-units-001.htm == reference/no-red-on-blank-page-ref.htm
 numbers-units-003.htm == reference/no-red-on-blank-page-ref.htm
+numbers-units-004.htm == reference/ref-filled-black-96px-square.htm
 numbers-units-005.htm == reference/no-red-on-blank-page-ref.htm
+numbers-units-006.htm == reference/ref-filled-black-96px-square.htm
+numbers-units-007.htm == reference/numbers-units-007-ref.htm
+numbers-units-009.htm == reference/numbers-units-009-ref.htm
+numbers-units-010.htm == reference/numbers-units-010-ref.htm
+numbers-units-011.htm == reference/numbers-units-011-ref.htm
+numbers-units-012.htm == reference/numbers-units-012-ref.htm
+numbers-units-013.htm == reference/numbers-units-013-ref.htm
+numbers-units-015.htm == reference/numbers-units-014-ref-a.htm
+numbers-units-015.htm == reference/numbers-units-014-ref-b.htm
 numbers-units-016.htm == reference/no-red-on-blank-page-ref.htm
 numbers-units-017.htm == reference/no-red-on-blank-page-ref.htm
+numbers-units-018.htm == reference/numbers-units-018-ref.htm
+numbers-units-019.htm == reference/numbers-units-019-ref.htm
+numbers-units-021.htm == reference/numbers-units-021-ref.htm
 other-attribute-001.htm == reference/no-red-on-blank-page-ref.htm
 outline-applies-to-005.htm == reference/no-red-on-blank-page-ref.htm
 outline-applies-to-006.htm == reference/no-red-on-blank-page-ref.htm
@@ -5047,6 +5222,10 @@ pseudo-015.htm == reference/no-red-filler-text-ref.htm
 pseudo-016.htm == reference/no-red-filler-text-ref.htm
 quoted-keywords-001.htm == reference/no-red-filler-text-ref.htm
 quoted-keywords-002.htm == reference/no-red-filler-text-ref.htm
+quoted-string-001.htm == reference/quoted-string-001-ref.htm
+quoted-string-002.htm == reference/quoted-string-002-ref.htm
+quoted-string-003.htm == reference/quoted-string-001-ref.htm
+quoted-string-004.htm == reference/quoted-string-002-ref.htm
 quotes-035.htm == reference/quotes-035-ref.htm
 quotes-035a.htm == reference/quotes-035-ref.htm
 quotes-036.htm == reference/quotes-035-ref.htm
@@ -5263,6 +5442,7 @@ run-in-text-between-002.htm == reference/run-in-text-ref.htm
 run-in-text-between-003.htm == reference/run-in-text-ref.htm
 run-in-text-between-004.htm == reference/run-in-basic-ref.htm
 run-in-text-between-005.htm == reference/run-in-basic-ref.htm
+selectors-parsing-001.htm == reference/selectors-parsing-001-ref.htm
 separated-border-model-003a.htm == reference/ref-filled-green-100px-square.htm
 separated-border-model-003b.htm == reference/separated-border-model-003b-ref.htm
 separated-border-model-004a.htm == reference/ref-filled-green-100px-square.htm
@@ -5273,7 +5453,9 @@ separated-border-model-004e.htm == reference/separated-border-model-004e-ref.htm
 separated-border-model-007.htm == reference/separated-border-model-007-ref.htm
 separated-border-model-008.htm == reference/separated-border-model-007-ref.htm
 separated-border-model-009.htm == reference/separated-border-model-007-ref.htm
+sgml-comments-000.htm == reference/ref-this-text-should-be-green.htm
 sgml-comments-001.htm == reference/filler-text-below-green.htm
+sgml-comments-002.htm == reference/sgml-comments-002-ref.htm
 shand-border-000.htm == reference/shand-border-000-ref.htm
 shand-border-001.htm == reference/ref-if-there-is-no-red.htm
 shand-font-000.htm == reference/shand-font-000-ref.htm
@@ -5296,6 +5478,7 @@ stack-floats-001.htm == reference/stack-floats-001-ref.htm
 stack-floats-002.htm == reference/stack-floats-001-ref.htm
 stack-floats-003.htm == reference/stack-floats-001-ref.htm
 stack-floats-004.htm == reference/stack-floats-001-ref.htm
+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
@@ -5458,21 +5641,31 @@ units-001.htm == reference/units-001-ref.htm
 units-002.htm == reference/units-002-ref.htm
 units-003.htm == reference/units-003-ref.htm
 units-004.htm == reference/units-004-ref.htm
+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-003.htm == reference/filler-text-below-green.htm
 universal-selector-004.htm == reference/filler-text-below-green.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
 uri-003.htm == reference/no-red-filler-text-ref.htm
+uri-004.htm == reference/ref-green-background.htm
+uri-005.htm == reference/ref-green-background.htm
 uri-006.htm == reference/no-red-filler-text-ref.htm
 uri-007.htm == reference/no-red-filler-text-ref.htm
 uri-008.htm == reference/no-red-filler-text-ref.htm
 uri-009.htm == reference/no-red-filler-text-ref.htm
 uri-010.htm == reference/no-red-filler-text-ref.htm
 uri-011.htm == reference/no-red-filler-text-ref.htm
+uri-012.htm == reference/uri-012-ref.htm
 uri-013.htm == reference/uri-013-ref.htm
+uri-014.htm == reference/ref-green-background.htm
+uri-015.htm == reference/ref-green-background.htm
+uri-016.htm == reference/uri-016-ref.htm
+uri-017.htm == reference/uri-017-ref.htm
+uri-018.htm == reference/ref-this-text-should-be-green.htm
 vertical-align-004.htm == reference/vertical-align-004-ref.htm
 vertical-align-005.htm == reference/vertical-align-004-ref.htm
 vertical-align-006.htm == reference/vertical-align-004-ref.htm
@@ -5576,6 +5769,8 @@ white-space-pre-002.htm == reference/white-space-pre-002-ref.htm
 white-space-pre-005.htm == reference/white-space-normal-005-ref.htm
 white-space-pre-006.htm == reference/white-space-normal-005-ref.htm
 white-space-processing-049.htm == reference/white-space-processing-049-ref.htm
+whitespace-001.htm == reference/no-red-filler-text-ref.htm
+whitespace-002.htm == reference/no-red-filler-text-ref.htm
 width-001.htm == reference/ref-if-there-is-no-red.htm
 width-002.htm == reference/ref-if-there-is-no-red.htm
 width-003.htm == reference/max-width-003-ref.htm
diff --git a/tests/wpt/css-tests/css21_dev/html4/select-cursor-001-manual.htm b/tests/wpt/css-tests/css21_dev/html4/select-cursor-001-manual.htm
new file mode 100644
index 00000000000..b1d968a3a8d
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/html4/select-cursor-001-manual.htm
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html><head>
+  <meta charset="utf-8">
+  <title>CSS Test (User Interface): cursor property and select element</title>
+  <link href="http://chrisrebert.com" rel="author" title="Chris Rebert">
+  <link href="https://drafts.csswg.org/css-ui-3/#cursor" rel="help">
+  <link href="https://drafts.csswg.org/css2/ui.html#cursor-props" rel="help">
+  <meta content="HTMLonly interact" name="flags">
+  <meta content="Hovering the pointer over a select menu on top of an element with a cursor set should not display said cursor" name="assert">
+  <style>
+div {
+  cursor: help;
+  height: 200px;
+  width: 200px;
+  background-color: blue;
+}
+  </style>
+</head>
+<body>
+  <ol>
+    <li>If clicking a &lt;select&gt; opens a native widget which is modal, then SKIP this test.</li>
+    <li>Click on the &lt;select&gt; below. A selection widget appears.</li>
+    <li>Move the pointer so that it is hovering within the intersection area of the selection widget and the blue box below.</li>
+    <li>If the "help" cursor is displayed, then the test result is FAILED. Otherwise, it is PASSED.</li>
+  </ol>
+  <select>
+    <option>AAAAAAAA</option>
+    <option>BBBBBBBB</option>
+    <option>CCCCCCCC</option>
+    <option>DDDDDDDD</option>
+    <option>EEEEEEEE</option>
+    <option>FFFFFFFF</option>
+    <option>GGGGGGGG</option>
+    <option>HHHHHHHH</option>
+  </select>
+  <div></div>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/selectors-parsing-001.htm b/tests/wpt/css-tests/css21_dev/html4/selectors-parsing-001.htm
index cef96565fa8..a20d9e65a59 100644
--- a/tests/wpt/css-tests/css21_dev/html4/selectors-parsing-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/selectors-parsing-001.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/parsing/001.xml" type="application/xhtml+xml">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/selectors-parsing-001-ref.htm">
   <style type="text/css">
    p { background: white; color: green; }
    p:invalidPseudoClass, p.test1 { color: yellow; background: red; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/sgml-comments-000.htm b/tests/wpt/css-tests/css21_dev/html4/sgml-comments-000.htm
index 354329ee854..88a5e731aba 100644
--- a/tests/wpt/css-tests/css21_dev/html4/sgml-comments-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/sgml-comments-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: SGML comments</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#comments">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="">
   <meta name="assert" content="UAs must ignore SGML comment delimiters between statements.">
 <style type="text/css">
@@ -15,7 +16,7 @@ p {color: green}
  </head>
  <body>
 
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/sgml-comments-002.htm b/tests/wpt/css-tests/css21_dev/html4/sgml-comments-002.htm
index 73074261886..a81ab774a51 100644
--- a/tests/wpt/css-tests/css21_dev/html4/sgml-comments-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/sgml-comments-002.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/cdocdc/001.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#comments">
+  <link rel="match" href="reference/sgml-comments-002-ref.htm">
   <style type="text/css">
     <!--
     .a { color: green; } -->
@@ -14,8 +15,8 @@
   </style>
  </head>
  <body>
-  <p class="a">This line should be green.</p>
-  <p class="b">This line should be green.</p>
-  <p class="c">This line should be green.</p>
+  <p class="a">This text should be green.</p>
+  <p class="b">This text should be green.</p>
+  <p class="c">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/strings-000.htm b/tests/wpt/css-tests/css21_dev/html4/strings-000.htm
index 8192a601c67..2b713b82e10 100644
--- a/tests/wpt/css-tests/css21_dev/html4/strings-000.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/strings-000.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Newlines in strings</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
     p { color: red }
     p[title="this is\
@@ -11,6 +12,6 @@
   </style>
  </head>
  <body>
-  <p title="this is a test">This should be green</p>
+  <p title="this is a test">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/toc.htm b/tests/wpt/css-tests/css21_dev/html4/toc.htm
index 29c993248bb..9187d07df1a 100644
--- a/tests/wpt/css-tests/css21_dev/html4/toc.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/toc.htm
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.htm">Chapter 4 - 
         Syntax and basic data types</a></th>
-      <td>(439 Tests)</td></tr>
+      <td>(438 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.htm">Chapter 5 - 
@@ -57,17 +57,17 @@
     <tbody id="s8">
       <tr><th><a href="chapter-8.htm">Chapter 8 - 
         Box model</a></th>
-      <td>(2326 Tests)</td></tr>
+      <td>(2327 Tests)</td></tr>
     </tbody>
     <tbody id="s9">
       <tr><th><a href="chapter-9.htm">Chapter 9 - 
         Visual formatting model</a></th>
-      <td>(1245 Tests)</td></tr>
+      <td>(1246 Tests)</td></tr>
     </tbody>
     <tbody id="s10">
       <tr><th><a href="chapter-10.htm">Chapter 10 - 
         Visual formatting model details</a></th>
-      <td>(1481 Tests)</td></tr>
+      <td>(1449 Tests)</td></tr>
     </tbody>
     <tbody id="s11">
       <tr><th><a href="chapter-11.htm">Chapter 11 - 
@@ -97,7 +97,7 @@
     <tbody id="s16">
       <tr><th><a href="chapter-16.htm">Chapter 16 - 
         Text</a></th>
-      <td>(608 Tests)</td></tr>
+      <td>(609 Tests)</td></tr>
     </tbody>
     <tbody id="s17">
       <tr><th><a href="chapter-17.htm">Chapter 17 - 
@@ -107,7 +107,7 @@
     <tbody id="s18">
       <tr><th><a href="chapter-18.htm">Chapter 18 - 
         User interface</a></th>
-      <td>(360 Tests)</td></tr>
+      <td>(361 Tests)</td></tr>
     </tbody>
     <tbody id="sA">
       <tr><th><a href="chapter-A.htm">Appendix A - 
diff --git a/tests/wpt/css-tests/css21_dev/html4/units-005.htm b/tests/wpt/css-tests/css21_dev/html4/units-005.htm
index e9d473e39d6..75c58ce7c03 100644
--- a/tests/wpt/css-tests/css21_dev/html4/units-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/units-005.htm
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/units/005.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units">
+  <link rel="match" href="reference/units-005-ref.htm">
 
   <style type="text/css">
    div { width: 8.7em; height: 8.7em; background: red; border: solid lime; }
diff --git a/tests/wpt/css-tests/css21_dev/html4/unterminated-string-001.htm b/tests/wpt/css-tests/css21_dev/html4/unterminated-string-001.htm
index a3e2be6ab55..21eea41f760 100644
--- a/tests/wpt/css-tests/css21_dev/html4/unterminated-string-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/unterminated-string-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: Error handling of unterminated strings</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+        <link rel="match" href="reference/filler-text-below-green.htm">
         <meta name="flags" content="invalid">
         <meta name="assert" content="When the parser encounters an unterminated string, the parser drops everything up to the next ';'.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/uri-004.htm b/tests/wpt/css-tests/css21_dev/html4/uri-004.htm
index d10b56f5661..a3dbd379029 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-004.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-004.htm
@@ -4,17 +4,18 @@
         <title>CSS Test: URL function with URI that has escaped special chars</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri">
+        <link rel="match" href="reference/ref-green-background.htm">
         <meta name="flags" content="image">
         <meta name="assert" content="URI escapes are allowed in URL functions.">
         <style type="text/css">
-            div
+            p
             {
+                color: white;
                 background: red url(support/%27green%20block.png);
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the box below is green.</p>
-        <div>Filler Text</div>
+        <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/uri-005.htm b/tests/wpt/css-tests/css21_dev/html4/uri-005.htm
index 641d1d86c48..53b68254955 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-005.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-005.htm
@@ -4,17 +4,18 @@
         <title>CSS Test: URL function with escaped special chars - single quote</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri">
+        <link rel="match" href="reference/ref-green-background.htm">
         <meta name="flags" content="image">
         <meta name="assert" content="Single quote characters appearing in an unquoted URI need to be escaped with a backslash so that the resulting URI value is a URI token.">
         <style type="text/css">
-            div
+            p
             {
+                color: white;
                 background: red url(support/\'green\ block.png);
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the box below is green.</p>
-        <div>Filler Text</div>
+        <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/uri-012.htm b/tests/wpt/css-tests/css21_dev/html4/uri-012.htm
index 0b396097c81..1b16b7da043 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-012.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-012.htm
@@ -6,6 +6,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/uri/010.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri">
+  <link rel="match" href="reference/uri-012-ref.htm">
   <meta name="flags" content="invalid">
   <style>
    .control {
diff --git a/tests/wpt/css-tests/css21_dev/html4/uri-014.htm b/tests/wpt/css-tests/css21_dev/html4/uri-014.htm
index c68fa2fb555..c835094dfa1 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-014.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-014.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Unquoted commas in url()</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="">
   <meta name="assert" content="Unquoted commas inside url() are valid.">
   <style type="text/css">
@@ -15,6 +16,6 @@
   </style>
  </head>
  <body>
-  <p>This sentence must have a green background.</p>
+  <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/uri-015.htm b/tests/wpt/css-tests/css21_dev/html4/uri-015.htm
index 6a618ccad66..3af47adc17c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-015.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-015.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Escaped url() functional notation</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri">
+  <link rel="match" href="reference/ref-green-background.htm">
   <meta name="flags" content="">
   <meta name="assert" content="url() notation is case-insensitive and can be escaped.">
   <style type="text/css">
@@ -15,6 +16,6 @@
   </style>
  </head>
  <body>
-  <p>This sentence must have a green background.</p>
+  <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/uri-016.htm b/tests/wpt/css-tests/css21_dev/html4/uri-016.htm
index a5a12d6a3ec..e61b66335e0 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-016.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-016.htm
@@ -6,6 +6,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/uri/007.html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri">
+  <link rel="match" href="reference/uri-016-ref.htm">
   <meta name="flags" content="">
   <meta name="assert" content="Comments are just regular tokens inside      unquoted URLs.">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/uri-017.htm b/tests/wpt/css-tests/css21_dev/html4/uri-017.htm
index 4612254ad22..ecee676aeb4 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-017.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-017.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Unclosed URI Token at EOF (in declaration)</title>
   <link rel="author" title="Bert Bos" href="mailto:bert@w3.org">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/uri-017-ref.htm">
   <meta name="flags" content="invalid image">
   <meta name="assert" content="User agents must close open URI constructs and style rules at the end of the style sheet.">
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/uri-018.htm b/tests/wpt/css-tests/css21_dev/html4/uri-018.htm
index bbedd324604..40490976d15 100644
--- a/tests/wpt/css-tests/css21_dev/html4/uri-018.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/uri-018.htm
@@ -4,6 +4,7 @@
   <title>CSS Test: Unclosed URI Token at EOF (in @import)</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <meta name="flags" content="invalid image">
   <meta name="assert" content="User agents must close open URI constructs and statements at the end of the style sheet.">
   <style type="text/css">
@@ -11,6 +12,6 @@
     p { color: red; }
  </head>
  <body>
-  <p class="import">This sentence must be green.</p>
+  <p class="import">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-002a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-002a.htm
deleted file mode 100644
index ee8edd31361..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-002a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-002b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-002b.htm
deleted file mode 100644
index 366578f274a..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-002b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-003a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-003a.htm
deleted file mode 100644
index dcd71bd5e80..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-003a.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-003b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-003b.htm
deleted file mode 100644
index 7b0937809f4..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-003b.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-005a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-005a.htm
deleted file mode 100644
index c70bb3a065c..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-005a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-005b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-005b.htm
deleted file mode 100644
index f9d022925b9..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-005b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-008a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-008a.htm
deleted file mode 100644
index 9d5f6534663..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-008a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-008b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-008b.htm
deleted file mode 100644
index a10687f9446..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-008b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-011a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-011a.htm
deleted file mode 100644
index ded3193bacd..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-011a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-011b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-011b.htm
deleted file mode 100644
index 430e12f7346..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-011b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-012l.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-012l.htm
deleted file mode 100644
index f3fd97e4049..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-012l.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-012r.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-012r.htm
deleted file mode 100644
index 2841a9b510f..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-012r.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-014a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-014a.htm
deleted file mode 100644
index b89c0cc51b9..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-014a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-014b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-014b.htm
deleted file mode 100644
index 9a640925364..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-014b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-015a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-015a.htm
deleted file mode 100644
index f3afe48fa25..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-015a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-015b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-015b.htm
deleted file mode 100644
index 44f4038e335..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-015b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-017a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-017a.htm
deleted file mode 100644
index 2e117ad9c3c..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-017a.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-017b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-017b.htm
deleted file mode 100644
index c5fd68544f8..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-017b.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-018a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-018a.htm
deleted file mode 100644
index 2c146eb21fd..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-018a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-018b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-018b.htm
deleted file mode 100644
index 43a49e6b40d..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-018b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-020a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-020a.htm
deleted file mode 100644
index 5761d54e9e5..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-020a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-020b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-020b.htm
deleted file mode 100644
index d68b3988718..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-020b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-021a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-021a.htm
deleted file mode 100644
index fd6720dcb97..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-021a.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-021b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-021b.htm
deleted file mode 100644
index dc6362d8888..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-021b.htm
+++ /dev/null
@@ -1,70 +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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-023a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-023a.htm
deleted file mode 100644
index 99653606dbf..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-023a.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-023b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-023b.htm
deleted file mode 100644
index e981122d2ed..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-023b.htm
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-024a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-024a.htm
deleted file mode 100644
index 4fedb94c5c6..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-024a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-024b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-024b.htm
deleted file mode 100644
index 69e5ae449c0..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-024b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-026a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-026a.htm
deleted file mode 100644
index 76b4ffbca1f..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-026a.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-026b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-026b.htm
deleted file mode 100644
index f897570b395..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-026b.htm
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-027a.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-027a.htm
deleted file mode 100644
index 6c6dedc19c6..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-027a.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-027b.htm b/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-027b.htm
deleted file mode 100644
index 4f9890bbc90..00000000000
--- a/tests/wpt/css-tests/css21_dev/html4/vertical-alignment-027b.htm
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment">
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height">
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.">
-    <meta name="flags" content="ahem image">
-    <style type="text/css">
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  </style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled">
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled">
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/html4/whitespace-001.htm b/tests/wpt/css-tests/css21_dev/html4/whitespace-001.htm
index 90efa383b88..6ac973c210f 100644
--- a/tests/wpt/css-tests/css21_dev/html4/whitespace-001.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/whitespace-001.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: White space - em-space (U+2003)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">
+        <link rel="match" href="reference/no-red-filler-text-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Em-space is not treated as white space.">
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/html4/whitespace-002.htm b/tests/wpt/css-tests/css21_dev/html4/whitespace-002.htm
index 29a794aa557..e12f6091c46 100644
--- a/tests/wpt/css-tests/css21_dev/html4/whitespace-002.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/whitespace-002.htm
@@ -4,6 +4,7 @@
         <title>CSS Test: White space - ideographic space (U+3000)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">
+        <link rel="match" href="reference/no-red-filler-text-ref.htm">
         <meta name="flags" content="">
         <meta name="assert" content="Ideographic space is not treated as white space.">
         <style type="text/css">
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 9bc7e1520dd..f06ca335109 100644
--- a/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
@@ -936,57 +936,57 @@ html4/anonymous-inline-whitespace-001.htm	7fe25707146e900febf8b549fc3588da7be6b1
 xhtml1/anonymous-inline-whitespace-001.xht	7fe25707146e900febf8b549fc3588da7be6b1ae	?
 html4/anonymous-table-box-width-001.htm	43447b070391816bdb697e1b3d2b485013c14a08	?
 xhtml1/anonymous-table-box-width-001.xht	43447b070391816bdb697e1b3d2b485013c14a08	?
-html4/at-charset-001.htm	4bf6f48a7e193f16d711ddc6bb4715793fc8ced2	?
-xhtml1/at-charset-001.xht	4bf6f48a7e193f16d711ddc6bb4715793fc8ced2	?
-html4/at-charset-002.htm	2c0f52ac45b5abfbcf011fecb01e87a9d90a3774	?
-xhtml1/at-charset-002.xht	2c0f52ac45b5abfbcf011fecb01e87a9d90a3774	?
-html4/at-charset-003.htm	b9fc7ffdd31c1f7c1a285e374987327d993450bf	?
-xhtml1/at-charset-003.xht	b9fc7ffdd31c1f7c1a285e374987327d993450bf	?
-html4/at-charset-004.htm	3d8334e5c8d7da941ddd2c6fc30aae870301e902	?
-xhtml1/at-charset-004.xht	3d8334e5c8d7da941ddd2c6fc30aae870301e902	?
-html4/at-charset-005.htm	607e2d745abbecd99158a8b8bec64df8b7abd294	?
-xhtml1/at-charset-005.xht	607e2d745abbecd99158a8b8bec64df8b7abd294	?
-html4/at-charset-006.htm	ba407373c3ced5994252ff94916e2c5d5cea5427	?
-xhtml1/at-charset-006.xht	ba407373c3ced5994252ff94916e2c5d5cea5427	?
-html4/at-charset-007.htm	4016605b2e0ca67dbb752c5d31943ed67c65d944	?
-xhtml1/at-charset-007.xht	4016605b2e0ca67dbb752c5d31943ed67c65d944	?
-html4/at-charset-008.htm	0de2426e92018d1354227c0daf8cfa0e18d47a21	?
-xhtml1/at-charset-008.xht	0de2426e92018d1354227c0daf8cfa0e18d47a21	?
-html4/at-charset-009.htm	dca97c9cff496623b15e84fbaa6eda46fa5a2ed4	?
-xhtml1/at-charset-009.xht	dca97c9cff496623b15e84fbaa6eda46fa5a2ed4	?
-html4/at-charset-010.htm	672e65e1d9a01be75563d84ddd9b2f6366687e01	?
-xhtml1/at-charset-010.xht	672e65e1d9a01be75563d84ddd9b2f6366687e01	?
-html4/at-charset-011.htm	b89b7e2e15e09db49ad4beb25eb5d30ec8935088	?
-xhtml1/at-charset-011.xht	b89b7e2e15e09db49ad4beb25eb5d30ec8935088	?
-html4/at-charset-012.htm	b5eb6c03901e3076df56581e798029b3b7e831ad	?
-xhtml1/at-charset-012.xht	b5eb6c03901e3076df56581e798029b3b7e831ad	?
+html4/at-charset-001.htm	93897b73f6608b76f4a5019b6332498d66819dac	?
+xhtml1/at-charset-001.xht	93897b73f6608b76f4a5019b6332498d66819dac	?
+html4/at-charset-002.htm	3321d569645976e4ad31ad7d8ae56beec83fc93a	?
+xhtml1/at-charset-002.xht	3321d569645976e4ad31ad7d8ae56beec83fc93a	?
+html4/at-charset-003.htm	c9d5df0b136416557c7fdb6f4bcf5dc985b00ce1	?
+xhtml1/at-charset-003.xht	c9d5df0b136416557c7fdb6f4bcf5dc985b00ce1	?
+html4/at-charset-004.htm	3f11f93fb92e27a22b5c015bc47babd445609651	?
+xhtml1/at-charset-004.xht	3f11f93fb92e27a22b5c015bc47babd445609651	?
+html4/at-charset-005.htm	87668d0a4ffb30a0a88a4ead0693a426c00037a3	?
+xhtml1/at-charset-005.xht	87668d0a4ffb30a0a88a4ead0693a426c00037a3	?
+html4/at-charset-006.htm	f22ace8a452f783ecebba8ccf6646a548665ef05	?
+xhtml1/at-charset-006.xht	f22ace8a452f783ecebba8ccf6646a548665ef05	?
+html4/at-charset-007.htm	f0a613cab842dcb89e298cf1d33b2374b11b4da4	?
+xhtml1/at-charset-007.xht	f0a613cab842dcb89e298cf1d33b2374b11b4da4	?
+html4/at-charset-008.htm	f35f30557db816f2f2490f3a79bf6b65d04b5401	?
+xhtml1/at-charset-008.xht	f35f30557db816f2f2490f3a79bf6b65d04b5401	?
+html4/at-charset-009.htm	793c282531b63bbbe7abfc3a98055359d573e2cd	?
+xhtml1/at-charset-009.xht	793c282531b63bbbe7abfc3a98055359d573e2cd	?
+html4/at-charset-010.htm	cbc1ff89a28459d6a5315580df00c55a1bd28c0f	?
+xhtml1/at-charset-010.xht	cbc1ff89a28459d6a5315580df00c55a1bd28c0f	?
+html4/at-charset-011.htm	92eb5671531e588e905b89f9a640d91c0738e8fd	?
+xhtml1/at-charset-011.xht	92eb5671531e588e905b89f9a640d91c0738e8fd	?
+html4/at-charset-012.htm	35df77f52ef1aa8216c07921a4d611f59e6aa7ea	?
+xhtml1/at-charset-012.xht	35df77f52ef1aa8216c07921a4d611f59e6aa7ea	?
 html4/at-charset-013.htm	145d211ea37c74e5394d6b6f93328fe536f21a1d	?
-html4/at-charset-014.htm	d5ea66e93b7fd447d5214e0fefa1e64998e2a5fe	?
-xhtml1/at-charset-014.xht	d5ea66e93b7fd447d5214e0fefa1e64998e2a5fe	?
-html4/at-charset-015.htm	0e8a58ff89b32cef8f641c6566e8ad24f3e501e6	?
-xhtml1/at-charset-015.xht	0e8a58ff89b32cef8f641c6566e8ad24f3e501e6	?
-html4/at-charset-016.htm	57df924a54426a8651d2ebef45ab60c9db966793	?
-xhtml1/at-charset-016.xht	57df924a54426a8651d2ebef45ab60c9db966793	?
-html4/at-charset-019.htm	4cd7ea47c955aabb9a2e3cf2438132eb6e01deac	?
-xhtml1/at-charset-019.xht	4cd7ea47c955aabb9a2e3cf2438132eb6e01deac	?
-html4/at-charset-020.htm	fac7572ec79805a617c05a3266d9a745723365e4	?
-xhtml1/at-charset-020.xht	fac7572ec79805a617c05a3266d9a745723365e4	?
-html4/at-charset-021.htm	02602dfdbaf2b2a7b6a3b97214cc969e6b1574c1	?
-xhtml1/at-charset-021.xht	02602dfdbaf2b2a7b6a3b97214cc969e6b1574c1	?
-html4/at-charset-024.htm	2c92f2774b62bbdd091a6730469e0310253eb44b	?
-xhtml1/at-charset-024.xht	2c92f2774b62bbdd091a6730469e0310253eb44b	?
-html4/at-charset-025.htm	fe6fba7d17634715d6e12c7103ba9868f88c39c9	?
-xhtml1/at-charset-025.xht	fe6fba7d17634715d6e12c7103ba9868f88c39c9	?
-html4/at-charset-026.htm	27bf4ccd80875414653b26ea51e01b66250a013a	?
-xhtml1/at-charset-026.xht	27bf4ccd80875414653b26ea51e01b66250a013a	?
-html4/at-charset-027.htm	248ed657ce11b5072c5e5d07d7c65b8872fe05dd	?
-xhtml1/at-charset-027.xht	248ed657ce11b5072c5e5d07d7c65b8872fe05dd	?
-html4/at-charset-028.htm	aaa9e201e3f30cf88a01e6f037436f28fd57ee09	?
-xhtml1/at-charset-028.xht	aaa9e201e3f30cf88a01e6f037436f28fd57ee09	?
-html4/at-charset-029.htm	d6a48c0416a49e8c29d2180faf72c581aa709494	?
-xhtml1/at-charset-029.xht	d6a48c0416a49e8c29d2180faf72c581aa709494	?
-html4/at-charset-030.htm	9e96f5e5537f454307477203131f96813ea5acb6	?
-xhtml1/at-charset-030.xht	9e96f5e5537f454307477203131f96813ea5acb6	?
+html4/at-charset-014.htm	035ea1d49efaf9456f5a528626324c6163475825	?
+xhtml1/at-charset-014.xht	035ea1d49efaf9456f5a528626324c6163475825	?
+html4/at-charset-015.htm	f98f9c1fcfbc6cc3bda50c37fe3c9c109fc0569f	?
+xhtml1/at-charset-015.xht	f98f9c1fcfbc6cc3bda50c37fe3c9c109fc0569f	?
+html4/at-charset-016.htm	13c2949e046242c3c29d2d941af4fc0edc3d995b	?
+xhtml1/at-charset-016.xht	13c2949e046242c3c29d2d941af4fc0edc3d995b	?
+html4/at-charset-019.htm	1940dd08083bbe9e827cd9b882684a31eb60c451	?
+xhtml1/at-charset-019.xht	1940dd08083bbe9e827cd9b882684a31eb60c451	?
+html4/at-charset-020.htm	53ec3c6f2204bda5ee840a7a7534996259c7c735	?
+xhtml1/at-charset-020.xht	53ec3c6f2204bda5ee840a7a7534996259c7c735	?
+html4/at-charset-021.htm	399a1bc5223fb311b520d7f6d9a6517df9a06c18	?
+xhtml1/at-charset-021.xht	399a1bc5223fb311b520d7f6d9a6517df9a06c18	?
+html4/at-charset-024.htm	49c45cb0046ce1dc2870eeff339aee2b6f7f53bc	?
+xhtml1/at-charset-024.xht	49c45cb0046ce1dc2870eeff339aee2b6f7f53bc	?
+html4/at-charset-025.htm	b0197ed8e4f296aaf2601bedbfc8fb6b9728be8f	?
+xhtml1/at-charset-025.xht	b0197ed8e4f296aaf2601bedbfc8fb6b9728be8f	?
+html4/at-charset-026.htm	411e99161f309c366d5f9ee2673f001d67b64df9	?
+xhtml1/at-charset-026.xht	411e99161f309c366d5f9ee2673f001d67b64df9	?
+html4/at-charset-027.htm	e61001f9bb837600ecb36acbc54edfcbb148849d	?
+xhtml1/at-charset-027.xht	e61001f9bb837600ecb36acbc54edfcbb148849d	?
+html4/at-charset-028.htm	2a247ce833f7b9a1afdc54080e798855185f601b	?
+xhtml1/at-charset-028.xht	2a247ce833f7b9a1afdc54080e798855185f601b	?
+html4/at-charset-029.htm	68df5956df90e3212228eb631eb257b2d19e16d0	?
+xhtml1/at-charset-029.xht	68df5956df90e3212228eb631eb257b2d19e16d0	?
+html4/at-charset-030.htm	12123d3781b19919233ed7440bb876e36a03fe85	?
+xhtml1/at-charset-030.xht	12123d3781b19919233ed7440bb876e36a03fe85	?
 html4/at-charset-033.htm	1790635b5d1aab50bd3813477e051295dd7345e9	?
 xhtml1/at-charset-033.xht	1790635b5d1aab50bd3813477e051295dd7345e9	?
 html4/at-charset-034.htm	4a24ece550e2ea3ed62a9c9f7b51fd6f9dd00d41	?
@@ -1001,24 +1001,24 @@ html4/at-charset-038.htm	fbd982159e360eaaebfe4044f04cedcabbb86e2e	?
 xhtml1/at-charset-038.xht	fbd982159e360eaaebfe4044f04cedcabbb86e2e	?
 html4/at-charset-039.htm	4fa92eaadf698020ec2eb7d1f5fd1ba4ae1d7c95	?
 xhtml1/at-charset-039.xht	4fa92eaadf698020ec2eb7d1f5fd1ba4ae1d7c95	?
-html4/at-charset-040.htm	5e67c620f8e19b9fc8b8e4cfefcff0ddbc5321cb	?
-xhtml1/at-charset-040.xht	5e67c620f8e19b9fc8b8e4cfefcff0ddbc5321cb	?
-html4/at-charset-041.htm	66b8820875ee8b031c9fcf97cd4df58cba0b28c7	?
-xhtml1/at-charset-041.xht	66b8820875ee8b031c9fcf97cd4df58cba0b28c7	?
-html4/at-charset-042.htm	a9d4dc69e1463a1290fab4003a232746f6035430	?
-xhtml1/at-charset-042.xht	a9d4dc69e1463a1290fab4003a232746f6035430	?
-html4/at-charset-043.htm	79fe44529bba816a163aea4b531190c9e889835a	?
-xhtml1/at-charset-043.xht	79fe44529bba816a163aea4b531190c9e889835a	?
-html4/at-charset-044.htm	90605b2fdf5603a31c4407155594343cfb8e8435	?
-xhtml1/at-charset-044.xht	90605b2fdf5603a31c4407155594343cfb8e8435	?
-html4/at-charset-045.htm	c72b5464da0a3546dd9c1efbfb47209f3250e51e	?
-xhtml1/at-charset-045.xht	c72b5464da0a3546dd9c1efbfb47209f3250e51e	?
-html4/at-charset-046.htm	f7415f7b55c2fd43ccb3bfe1f9d2b96e54f21d99	?
-xhtml1/at-charset-046.xht	f7415f7b55c2fd43ccb3bfe1f9d2b96e54f21d99	?
-html4/at-charset-047.htm	1f849cf79cf1d1c66aff8586e836a4d9ffc4040b	?
-xhtml1/at-charset-047.xht	1f849cf79cf1d1c66aff8586e836a4d9ffc4040b	?
-html4/at-charset-048.htm	e787a6663b3297ab6ee7e77f2a74e384e4c950c8	?
-xhtml1/at-charset-048.xht	e787a6663b3297ab6ee7e77f2a74e384e4c950c8	?
+html4/at-charset-040.htm	3e309d309100e9763e52b3a485ad128671d35ad0	?
+xhtml1/at-charset-040.xht	3e309d309100e9763e52b3a485ad128671d35ad0	?
+html4/at-charset-041.htm	730447b9716a636835e8ae8e90d2f2e62eeda22a	?
+xhtml1/at-charset-041.xht	730447b9716a636835e8ae8e90d2f2e62eeda22a	?
+html4/at-charset-042.htm	5227cfd6e5b85366a9f47f08996d444c3f79ee93	?
+xhtml1/at-charset-042.xht	5227cfd6e5b85366a9f47f08996d444c3f79ee93	?
+html4/at-charset-043.htm	c3275c3711f9addbb053b045c3259607fce551c4	?
+xhtml1/at-charset-043.xht	c3275c3711f9addbb053b045c3259607fce551c4	?
+html4/at-charset-044.htm	76f9d0fa15c413fce1a8be7f0939d5a6e9b06172	?
+xhtml1/at-charset-044.xht	76f9d0fa15c413fce1a8be7f0939d5a6e9b06172	?
+html4/at-charset-045.htm	aabf85f377f2aae34dd98c3754c5f5b4af6b22fc	?
+xhtml1/at-charset-045.xht	aabf85f377f2aae34dd98c3754c5f5b4af6b22fc	?
+html4/at-charset-046.htm	36409371ee6e5cf9934440d70a0e6db064e4a1fb	?
+xhtml1/at-charset-046.xht	36409371ee6e5cf9934440d70a0e6db064e4a1fb	?
+html4/at-charset-047.htm	9573d78d758ae285aee8f2df196e31ff820e5968	?
+xhtml1/at-charset-047.xht	9573d78d758ae285aee8f2df196e31ff820e5968	?
+html4/at-charset-048.htm	80e125ff50d402e39517d0110aaa77bdb2aa3c88	?
+xhtml1/at-charset-048.xht	80e125ff50d402e39517d0110aaa77bdb2aa3c88	?
 html4/at-charset-049.htm	f9414cc7378cfc6690d1a7afbab0e4bf260f8862	?
 xhtml1/at-charset-049.xht	f9414cc7378cfc6690d1a7afbab0e4bf260f8862	?
 html4/at-charset-050.htm	304a693abd605ca4ebf6d8ba51d12d0d52ef75fe	?
@@ -1029,36 +1029,36 @@ html4/at-charset-052.htm	be3b5dde981c44a2e6e31f5d1d105762f71eda11	?
 xhtml1/at-charset-052.xht	be3b5dde981c44a2e6e31f5d1d105762f71eda11	?
 html4/at-charset-053.htm	a499e9fc5ef9abaf9e3045580c134376891e5880	?
 xhtml1/at-charset-053.xht	a499e9fc5ef9abaf9e3045580c134376891e5880	?
-html4/at-charset-054.htm	a83e808cbbd903bb7afe894a18f635107bcad9e5	?
-xhtml1/at-charset-054.xht	a83e808cbbd903bb7afe894a18f635107bcad9e5	?
+html4/at-charset-054.htm	5521d5bc7c93989c690170e916c94306b9f2d537	?
+xhtml1/at-charset-054.xht	5521d5bc7c93989c690170e916c94306b9f2d537	?
 html4/at-charset-055.htm	27c13c2eb8858106158ce59426bb946a8b9ec191	?
 xhtml1/at-charset-055.xht	27c13c2eb8858106158ce59426bb946a8b9ec191	?
-html4/at-charset-056.htm	517e3f56227ebbcc51b5b1cc7a428e673079fb68	?
-xhtml1/at-charset-056.xht	517e3f56227ebbcc51b5b1cc7a428e673079fb68	?
+html4/at-charset-056.htm	87ea5fb7190a9e4a37354618158ca7e0c73c997f	?
+xhtml1/at-charset-056.xht	87ea5fb7190a9e4a37354618158ca7e0c73c997f	?
 html4/at-charset-057.htm	efcaaa9c444c37f7fcd81a14757571fafe7b4edc	?
 xhtml1/at-charset-057.xht	efcaaa9c444c37f7fcd81a14757571fafe7b4edc	?
 html4/at-charset-058.htm	a844563ef04870f0e44cf81d2943e9330d5970f1	?
 xhtml1/at-charset-058.xht	a844563ef04870f0e44cf81d2943e9330d5970f1	?
 html4/at-charset-059.htm	e3e11a52963a303acdef4a0709ab83197901a026	?
 xhtml1/at-charset-059.xht	e3e11a52963a303acdef4a0709ab83197901a026	?
-html4/at-charset-060.htm	14d3ff75bda3e1623dcc7e331167d23b60d846b9	?
-xhtml1/at-charset-060.xht	14d3ff75bda3e1623dcc7e331167d23b60d846b9	?
-html4/at-charset-061.htm	6abee0aa6960d9a115e8bccc55e2c61f6a4fa407	?
-xhtml1/at-charset-061.xht	6abee0aa6960d9a115e8bccc55e2c61f6a4fa407	?
-html4/at-charset-071.htm	8d34718670f2584d69fe620393ae9e60f0d0bc37	?
-xhtml1/at-charset-071.xht	8d34718670f2584d69fe620393ae9e60f0d0bc37	?
-html4/at-charset-072.htm	a7b8d3afe25b36b982e2a6f9b196b94320eb76bb	?
-xhtml1/at-charset-072.xht	a7b8d3afe25b36b982e2a6f9b196b94320eb76bb	?
-html4/at-charset-073.htm	289ef644ec3bf0132eed7b3f6afa552722afbf80	?
-xhtml1/at-charset-073.xht	289ef644ec3bf0132eed7b3f6afa552722afbf80	?
-html4/at-charset-074.htm	39d34bf2bd1a548f6df57d9a5c11d6de9d08c643	?
-xhtml1/at-charset-074.xht	39d34bf2bd1a548f6df57d9a5c11d6de9d08c643	?
-html4/at-charset-075.htm	b4c3bb5aa7bedab2251e7ca17efa80d05ac2f7a0	?
-xhtml1/at-charset-075.xht	b4c3bb5aa7bedab2251e7ca17efa80d05ac2f7a0	?
-html4/at-charset-076.htm	6fcb5909b0055257d8c77e3a056e989ff360dd2c	?
-xhtml1/at-charset-076.xht	6fcb5909b0055257d8c77e3a056e989ff360dd2c	?
-html4/at-charset-077.htm	8d7cc8b4c7fb8cf68f3e923572a79c2644e7fadb	?
-xhtml1/at-charset-077.xht	8d7cc8b4c7fb8cf68f3e923572a79c2644e7fadb	?
+html4/at-charset-060.htm	e2dda79c915d699ddc74b43b7b10e4b6e227d207	?
+xhtml1/at-charset-060.xht	e2dda79c915d699ddc74b43b7b10e4b6e227d207	?
+html4/at-charset-061.htm	0338e94efe2e1ee58ac138b484b80caf58952bff	?
+xhtml1/at-charset-061.xht	0338e94efe2e1ee58ac138b484b80caf58952bff	?
+html4/at-charset-071.htm	5b2e3469f7bada574545a686ca1642b3baf130f2	?
+xhtml1/at-charset-071.xht	5b2e3469f7bada574545a686ca1642b3baf130f2	?
+html4/at-charset-072.htm	c712f6afe4d73b46f4f59634e0a4442147d5d1c7	?
+xhtml1/at-charset-072.xht	c712f6afe4d73b46f4f59634e0a4442147d5d1c7	?
+html4/at-charset-073.htm	b6251d74bc0b88c424280d9cfa461a6f832c7b22	?
+xhtml1/at-charset-073.xht	b6251d74bc0b88c424280d9cfa461a6f832c7b22	?
+html4/at-charset-074.htm	4525247b089c813170ef851a59504de7a5959e43	?
+xhtml1/at-charset-074.xht	4525247b089c813170ef851a59504de7a5959e43	?
+html4/at-charset-075.htm	33196f7ef95f715e5ba17566e60069b2280c56ea	?
+xhtml1/at-charset-075.xht	33196f7ef95f715e5ba17566e60069b2280c56ea	?
+html4/at-charset-076.htm	0e923135d4b77a2bc1bb624081ed7be31a9d791c	?
+xhtml1/at-charset-076.xht	0e923135d4b77a2bc1bb624081ed7be31a9d791c	?
+html4/at-charset-077.htm	8cd18dfeb310d1ac39efa7ac1362b3f317011d9b	?
+xhtml1/at-charset-077.xht	8cd18dfeb310d1ac39efa7ac1362b3f317011d9b	?
 html4/at-charset-quotes-001.htm	d2a6bcd603dfa2cd437e1470c9c187efe2759f7c	?
 xhtml1/at-charset-quotes-001.xht	d2a6bcd603dfa2cd437e1470c9c187efe2759f7c	?
 html4/at-charset-space-001.htm	205c0029324ad9443dbe5f24a8e60ba67929e6ce	?
@@ -1093,18 +1093,18 @@ html4/at-import-007.htm	cff5ad9c4b5626535a4e28600b5c14a8a585edf4	?
 xhtml1/at-import-007.xht	cff5ad9c4b5626535a4e28600b5c14a8a585edf4	?
 html4/at-import-008.htm	9bcf440f20110a66791d0b3bcd4bc00a6eae5756	?
 xhtml1/at-import-008.xht	9bcf440f20110a66791d0b3bcd4bc00a6eae5756	?
-html4/at-import-009.htm	e5b371c428e39fcd01cc210d14ae42d75c979874	?
-xhtml1/at-import-009.xht	e5b371c428e39fcd01cc210d14ae42d75c979874	?
-html4/at-import-010.htm	3476b51cad2b67fe1ebc65f740baeb4b1a58ac4e	?
-xhtml1/at-import-010.xht	3476b51cad2b67fe1ebc65f740baeb4b1a58ac4e	?
-html4/at-import-011.htm	d1f428ce5248d4730cef02125a4e4273a8dcf341	?
-xhtml1/at-import-011.xht	d1f428ce5248d4730cef02125a4e4273a8dcf341	?
-html4/at-keywords-000.htm	5eda5f94a2ee1eeef4f77493b4416c06806bfcf2	?
-xhtml1/at-keywords-000.xht	5eda5f94a2ee1eeef4f77493b4416c06806bfcf2	?
-html4/at-keywords-001.htm	e7dc5faae9094132f6b569a384c82a4228475a94	?
-xhtml1/at-keywords-001.xht	e7dc5faae9094132f6b569a384c82a4228475a94	?
-html4/at-keywords-002.htm	0580cb5283ec9a7d9a8c8acbefd83d277ac4c37b	?
-xhtml1/at-keywords-002.xht	0580cb5283ec9a7d9a8c8acbefd83d277ac4c37b	?
+html4/at-import-009.htm	16c04492dd403e817be2978a5bdc457bcf756e31	?
+xhtml1/at-import-009.xht	16c04492dd403e817be2978a5bdc457bcf756e31	?
+html4/at-import-010.htm	c505b28c402da59ad76c8614c09089d105996433	?
+xhtml1/at-import-010.xht	c505b28c402da59ad76c8614c09089d105996433	?
+html4/at-import-011.htm	4a459a88cd479ff57127ae9de02a02eb0b29e0b7	?
+xhtml1/at-import-011.xht	4a459a88cd479ff57127ae9de02a02eb0b29e0b7	?
+html4/at-keywords-000.htm	6a69d35f45a0c4c8a3f6eb14236e6892bf3286ec	?
+xhtml1/at-keywords-000.xht	6a69d35f45a0c4c8a3f6eb14236e6892bf3286ec	?
+html4/at-keywords-001.htm	06bf0a07bc5f7c5e88fc7926225355dcdf508d47	?
+xhtml1/at-keywords-001.xht	06bf0a07bc5f7c5e88fc7926225355dcdf508d47	?
+html4/at-keywords-002.htm	84cd55a42d760ac64dbe2c37e9659b33322de5cc	?
+xhtml1/at-keywords-002.xht	84cd55a42d760ac64dbe2c37e9659b33322de5cc	?
 html4/at-page-rule-001.htm	465e1ba919d503e73e78ce261f350bcba2be8a42	?
 xhtml1/at-page-rule-001.xht	465e1ba919d503e73e78ce261f350bcba2be8a42	?
 html4/at-page-rule-002-a.htm	289e15dd0ad1b2e798302b4a25f28260f167d2e7	?
@@ -1137,18 +1137,18 @@ html4/at-rule-011.htm	ab913d2ccd90e19455dd9cf1b17fe094526a783e	?
 xhtml1/at-rule-011.xht	ab913d2ccd90e19455dd9cf1b17fe094526a783e	?
 html4/at-rule-012.htm	5b585b175c7d36257534d636f2f5b477fe902c08	?
 xhtml1/at-rule-012.xht	5b585b175c7d36257534d636f2f5b477fe902c08	?
-html4/at-rule-013.htm	083b2615b3c7341449003ddb25e16568469b41f1	?
-xhtml1/at-rule-013.xht	083b2615b3c7341449003ddb25e16568469b41f1	?
-html4/at-rules-000.htm	388e50ee967950d94b95d276821640c176205f98	?
-xhtml1/at-rules-000.xht	388e50ee967950d94b95d276821640c176205f98	?
-html4/at-rules-001.htm	341edab45d3db82aed036da1c86b203571ebffb6	?
-xhtml1/at-rules-001.xht	341edab45d3db82aed036da1c86b203571ebffb6	?
-html4/at-rules-002.htm	f7a6af678780077a42a8dbdd71771d2de5e8a9ca	?
-xhtml1/at-rules-002.xht	f7a6af678780077a42a8dbdd71771d2de5e8a9ca	?
-html4/at-rules-003.htm	8e742cc25254b207855d9662d23cd67eee2ac7c5	?
-xhtml1/at-rules-003.xht	8e742cc25254b207855d9662d23cd67eee2ac7c5	?
-html4/at-rules-004.htm	3a1d380dbae263b2ba3cde60d82930752ee39951	?
-xhtml1/at-rules-004.xht	3a1d380dbae263b2ba3cde60d82930752ee39951	?
+html4/at-rule-013.htm	5a1ce670762fad8b2a6a02b9298d4ba79de40657	?
+xhtml1/at-rule-013.xht	5a1ce670762fad8b2a6a02b9298d4ba79de40657	?
+html4/at-rules-000.htm	8984d98e5834069aa91748dadbba8a9f02d77936	?
+xhtml1/at-rules-000.xht	8984d98e5834069aa91748dadbba8a9f02d77936	?
+html4/at-rules-001.htm	80d762d15fd129796d6753260893d943e1f31c3c	?
+xhtml1/at-rules-001.xht	80d762d15fd129796d6753260893d943e1f31c3c	?
+html4/at-rules-002.htm	be9cf728ee887648237b132d34b7f06b35f974b1	?
+xhtml1/at-rules-002.xht	be9cf728ee887648237b132d34b7f06b35f974b1	?
+html4/at-rules-003.htm	0f5f5bc7045648e4263be989b35d6e065cdc87a3	?
+xhtml1/at-rules-003.xht	0f5f5bc7045648e4263be989b35d6e065cdc87a3	?
+html4/at-rules-004.htm	51faac3b5670dc4b9946fa92d5ee7d2c7b8d103c	?
+xhtml1/at-rules-004.xht	51faac3b5670dc4b9946fa92d5ee7d2c7b8d103c	?
 html4/attribute-000.htm	08f54a50e049cfda5273d6db76eeca9d63196de9	?
 xhtml1/attribute-000.xht	08f54a50e049cfda5273d6db76eeca9d63196de9	?
 html4/attribute-001.htm	4ae0bd0b643dbcd7426ae9d12cf7802c93ae5000	?
@@ -1169,8 +1169,8 @@ html4/attribute-selector-001.htm	e3c38cd712391d73ec4b0ec9ecca15c5a8f1a517	?
 xhtml1/attribute-selector-001.xht	e3c38cd712391d73ec4b0ec9ecca15c5a8f1a517	?
 html4/attribute-selector-002.htm	8258ef77fe8bc269d4ad7da52844fb69831f263a	?
 xhtml1/attribute-selector-002.xht	8258ef77fe8bc269d4ad7da52844fb69831f263a	?
-html4/attribute-token-selector-002.htm	4fed5b2bfee5d177247a5213af1def02c6066016	?
-xhtml1/attribute-token-selector-002.xht	4fed5b2bfee5d177247a5213af1def02c6066016	?
+html4/attribute-token-selector-002.htm	e3618655002fbb5400400c7e265d1e7ab68b0ef7	?
+xhtml1/attribute-token-selector-002.xht	e3618655002fbb5400400c7e265d1e7ab68b0ef7	?
 html4/attribute-value-selector-001.htm	5c12dacb95ba85424309f59e8355e56217f96b2f	?
 xhtml1/attribute-value-selector-001.xht	5c12dacb95ba85424309f59e8355e56217f96b2f	?
 html4/attribute-value-selector-002.htm	b6151b834ce6a9223c730d3f9ed09a2eec1497db	?
@@ -2819,6 +2819,8 @@ html4/bidi-002.htm	48d2d4ba08ef8b06d14ef353e9fb8caa30bb43af	?
 xhtml1/bidi-002.xht	48d2d4ba08ef8b06d14ef353e9fb8caa30bb43af	?
 html4/bidi-003.htm	4fc2169d7f75864298bca1a48c3d4d3bdb3560cf	?
 xhtml1/bidi-003.xht	4fc2169d7f75864298bca1a48c3d4d3bdb3560cf	?
+html4/bidi-004.htm	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	?
+xhtml1/bidi-004.xht	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	?
 html4/bidi-005.htm	9a94108988b0d806f23f5d63aec2a5b34d6aea05	?
 xhtml1/bidi-005.xht	9a94108988b0d806f23f5d63aec2a5b34d6aea05	?
 html4/bidi-005a.htm	dda3b25eee4cf8c4fb330bf2e2a25c6e100072b4	?
@@ -3281,8 +3283,8 @@ xhtml1/block-replaced-width-003.xht	d286f54ab19a2a9c0e5744ee0db5ba3be7aa8fd1	?
 xhtml1/block-replaced-width-004.xht	9d98220af48ccba399cbbe62b4a0e9fadfaf315d	?
 html4/block-replaced-width-006.htm	b79cd281f175a34dd4316a4684a2bc771159c952	?
 xhtml1/block-replaced-width-006.xht	b79cd281f175a34dd4316a4684a2bc771159c952	?
-html4/blocks-001.htm	885a498fba496af9060d91272bb3c3f145b61958	?
-xhtml1/blocks-001.xht	885a498fba496af9060d91272bb3c3f145b61958	?
+html4/blocks-001.htm	25e0683ce7ecb6d96c67779185a6821b13613260	?
+xhtml1/blocks-001.xht	25e0683ce7ecb6d96c67779185a6821b13613260	?
 html4/blocks-002.htm	afb870cce31ad045094a46e7cf72986b1d3373ef	?
 xhtml1/blocks-002.xht	afb870cce31ad045094a46e7cf72986b1d3373ef	?
 html4/blocks-003.htm	ee3e2dc5595f33f470f374eed87629ffd482dbb3	?
@@ -7441,8 +7443,8 @@ html4/c545-txttrans-000.htm	7fabf215ad43b97f8a14cde922c0f7404c8ac584	?
 xhtml1/c545-txttrans-000.xht	7fabf215ad43b97f8a14cde922c0f7404c8ac584	?
 html4/c546-txt-align-000.htm	b3d640f06e8d498da6faec465f9da063f421827e	?
 xhtml1/c546-txt-align-000.xht	b3d640f06e8d498da6faec465f9da063f421827e	?
-html4/c547-indent-000.htm	b545313dc540e1e8ef73f670e5bbd03036794c9b	?
-xhtml1/c547-indent-000.xht	b545313dc540e1e8ef73f670e5bbd03036794c9b	?
+html4/c547-indent-000.htm	5028b4f5684a246bcf9e2d3000cea5c3e90166cc	?
+xhtml1/c547-indent-000.xht	5028b4f5684a246bcf9e2d3000cea5c3e90166cc	?
 html4/c547-indent-001.htm	d9e8b2d2bae07517e5cc775e7970e99983938539	?
 xhtml1/c547-indent-001.xht	d9e8b2d2bae07517e5cc775e7970e99983938539	?
 html4/c548-leadin-000.htm	442a2f55c1c36b4aed885e38d6aab499ec47dc36	?
@@ -7573,8 +7575,8 @@ html4/c5509-padn-l-003.htm	95302550f100c9c00e0004078c3518b23ffc5111	?
 xhtml1/c5509-padn-l-003.xht	95302550f100c9c00e0004078c3518b23ffc5111	?
 html4/c5510-ipadn-000.htm	8a0006009d9e79f604c4b8771964d4c3010c3778	?
 xhtml1/c5510-ipadn-000.xht	8a0006009d9e79f604c4b8771964d4c3010c3778	?
-html4/c5510-padn-000.htm	9e3bb1b79261f42733d70a85ca5afd221c0a880c	?
-xhtml1/c5510-padn-000.xht	9e3bb1b79261f42733d70a85ca5afd221c0a880c	?
+html4/c5510-padn-000.htm	bcac38c1866b3173ecb6ab523d5a5027c0d7899b	?
+xhtml1/c5510-padn-000.xht	bcac38c1866b3173ecb6ab523d5a5027c0d7899b	?
 html4/c5510-padn-001.htm	f2a7912bf3dde9319c0f6a17874df1bd3347e515	?
 xhtml1/c5510-padn-001.xht	f2a7912bf3dde9319c0f6a17874df1bd3347e515	?
 html4/c5510-padn-002.htm	3d7dbc341cbe8b527118f554c7f8c85290dfc584	?
@@ -7855,36 +7857,36 @@ 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	b5f3a400c40bb654af7aa6014ac6fba015f7f37e	?
-xhtml1/cascade-import-dynamic-001.xht	b5f3a400c40bb654af7aa6014ac6fba015f7f37e	?
-html4/cascade-import-dynamic-002.htm	41dc89841b559d321bbff087120fb54eb40bdc51	?
-xhtml1/cascade-import-dynamic-002.xht	41dc89841b559d321bbff087120fb54eb40bdc51	?
-html4/cascade-import-dynamic-003.htm	13ba6697a066d47b3f37b385ab18c5da2299d3c5	?
-xhtml1/cascade-import-dynamic-003.xht	13ba6697a066d47b3f37b385ab18c5da2299d3c5	?
-html4/cascade-import-dynamic-004.htm	3824d204a805c7402b0f8cecfbcf59262bdf3856	?
-xhtml1/cascade-import-dynamic-004.xht	3824d204a805c7402b0f8cecfbcf59262bdf3856	?
-html4/cascade-import-dynamic-005.htm	2aa3461fd87b746d2def1e504fc45ee9a3e85dfd	?
-xhtml1/cascade-import-dynamic-005.xht	2aa3461fd87b746d2def1e504fc45ee9a3e85dfd	?
-html4/cascade-import-dynamic-006.htm	9a6ba30b25cce1559207b614c7adb355e9379458	?
-xhtml1/cascade-import-dynamic-006.xht	9a6ba30b25cce1559207b614c7adb355e9379458	?
-html4/cascade-import-dynamic-control.htm	c88ded9138267f7a9b7f40d6c6532a52bd1d5d80	?
-xhtml1/cascade-import-dynamic-control.xht	c88ded9138267f7a9b7f40d6c6532a52bd1d5d80	?
+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-precedence-001.htm	826330e8fb45187c92a17a871f14711bac0db58c	?
 xhtml1/cascade-precedence-001.xht	826330e8fb45187c92a17a871f14711bac0db58c	?
 html4/cascade-precedence-002.htm	41e9c15a09904182939a51d5bae3c891486767e1	?
 xhtml1/cascade-precedence-002.xht	41e9c15a09904182939a51d5bae3c891486767e1	?
-html4/case-sensitive-000.htm	b81e96602f56f392210761f44ce629582ced9712	?
-xhtml1/case-sensitive-000.xht	b81e96602f56f392210761f44ce629582ced9712	?
-html4/case-sensitive-001.htm	af75dbbc93201e15c5af8fdb794c07f75def7a29	?
-xhtml1/case-sensitive-001.xht	af75dbbc93201e15c5af8fdb794c07f75def7a29	?
-html4/case-sensitive-003.htm	3d8779c327d94a2c99ff24fc727185332574ff63	?
-xhtml1/case-sensitive-003.xht	3d8779c327d94a2c99ff24fc727185332574ff63	?
-html4/case-sensitive-004.htm	a84e22e78bd2d6a772a1fdc1f1a472b51397865d	?
-xhtml1/case-sensitive-004.xht	a84e22e78bd2d6a772a1fdc1f1a472b51397865d	?
-html4/case-sensitive-005.htm	0ed83a25320adfc9649a4b228376f90aeb858f7a	?
-xhtml1/case-sensitive-005.xht	0ed83a25320adfc9649a4b228376f90aeb858f7a	?
-html4/case-sensitive-006.htm	302684114f5129f4afcd4f7c8f5e92f3d37e5015	?
-xhtml1/case-sensitive-007.xht	1d6ba3ce822afad528c41bc7874e87b7310ecbae	?
+html4/case-sensitive-000.htm	863f7b43b72216913382e79904453fa305c050ad	?
+xhtml1/case-sensitive-000.xht	863f7b43b72216913382e79904453fa305c050ad	?
+html4/case-sensitive-001.htm	38908f97e5c56f38f4c2807bd5945d77580e75f4	?
+xhtml1/case-sensitive-001.xht	38908f97e5c56f38f4c2807bd5945d77580e75f4	?
+html4/case-sensitive-003.htm	1e07287509efaccf3f3adfe46d062f0ea27a0aeb	?
+xhtml1/case-sensitive-003.xht	1e07287509efaccf3f3adfe46d062f0ea27a0aeb	?
+html4/case-sensitive-004.htm	723fdbbe5941d318118e86cf5ae161312de476d2	?
+xhtml1/case-sensitive-004.xht	723fdbbe5941d318118e86cf5ae161312de476d2	?
+html4/case-sensitive-005.htm	dfd0240ea392700c15e32a28eec725b6db820f94	?
+xhtml1/case-sensitive-005.xht	dfd0240ea392700c15e32a28eec725b6db820f94	?
+html4/case-sensitive-006.htm	22e1a8c5e8284dd76b4937bb74102888636a7325	?
+xhtml1/case-sensitive-007.xht	07b1170801ad9349fabaf98db0ece9a247c6bbb5	?
 html4/case-sensitive-008.htm	8cf1bfbdf626dc47463dec1641223a3070ad05bb	?
 xhtml1/case-sensitive-008.xht	8cf1bfbdf626dc47463dec1641223a3070ad05bb	?
 html4/character-encoding-001.htm	fb6776fd6b89a215898ffd2f8a2939bca234fd6d	?
@@ -8271,8 +8273,8 @@ html4/collapsing-table-borders-013.htm	2425e935a93245af43e6922e56effa6bb541e432
 xhtml1/collapsing-table-borders-013.xht	2425e935a93245af43e6922e56effa6bb541e432	?
 html4/collapsing-table-borders-014.htm	bb347371ce31725381b1c7682b23a16eb03e0dc5	?
 xhtml1/collapsing-table-borders-014.xht	bb347371ce31725381b1c7682b23a16eb03e0dc5	?
-html4/color-000.htm	6c4732b9fe2e1f09af0a29820e0e5a0eb279aecb	?
-xhtml1/color-000.xht	6c4732b9fe2e1f09af0a29820e0e5a0eb279aecb	?
+html4/color-000.htm	ca24ae2e01e2d7574ff1b1d74d1a080e818e4e98	?
+xhtml1/color-000.xht	ca24ae2e01e2d7574ff1b1d74d1a080e818e4e98	?
 html4/color-001.htm	4fe843dcf45097eea8978a4189a5b46d832f8e70	?
 xhtml1/color-001.xht	4fe843dcf45097eea8978a4189a5b46d832f8e70	?
 html4/color-002.htm	36ca41bee49b8ed661d8b380c370d02047ea70b7	?
@@ -8611,8 +8613,8 @@ html4/colors-004.htm	36345dd6e5ad3f371f043088abfa13ca99e41516	?
 xhtml1/colors-004.xht	36345dd6e5ad3f371f043088abfa13ca99e41516	?
 html4/colors-005.htm	c218498e6af442dded6851a98d922339d54944de	?
 xhtml1/colors-005.xht	c218498e6af442dded6851a98d922339d54944de	?
-html4/colors-006.htm	c13c1101c45fe22f51d13f7b089dab1bb5959dad	?
-xhtml1/colors-006.xht	c13c1101c45fe22f51d13f7b089dab1bb5959dad	?
+html4/colors-006.htm	9e61b368ce600ee7b7fbb1db36ee314f4d439ec1	?
+xhtml1/colors-006.xht	9e61b368ce600ee7b7fbb1db36ee314f4d439ec1	?
 html4/colors-007.htm	aecf600a687dae2592618f11e8ddeb796bf20eb4	?
 xhtml1/colors-007.xht	aecf600a687dae2592618f11e8ddeb796bf20eb4	?
 html4/column-background-001.htm	9cac04c0174b9fde18f07c7a31ad462f8a5beaec	?
@@ -8997,40 +8999,40 @@ html4/content-attr-case-001.htm	931b842f10ec40ae8fbd9b273ae7247d1596ff48	?
 xhtml1/content-attr-case-002.xht	8f51b48e369494bfb30ac28c19acfd57462413e2	?
 html4/content-auto-reset-001.htm	073f16d82ce968e2b8068bfa814e1766852b4f2b	?
 xhtml1/content-auto-reset-001.xht	073f16d82ce968e2b8068bfa814e1766852b4f2b	?
-html4/content-counter-000.htm	6ff4653f5730ac9088be78dcf2d4c261d64ef54f	?
-xhtml1/content-counter-000.xht	6ff4653f5730ac9088be78dcf2d4c261d64ef54f	?
-html4/content-counter-001.htm	2d4000d7dfee00f305de20e4dba071b31b71b5fc	?
-xhtml1/content-counter-001.xht	2d4000d7dfee00f305de20e4dba071b31b71b5fc	?
-html4/content-counter-002.htm	076d4cdf37485dd8628c748975e09d29db73ab60	?
-xhtml1/content-counter-002.xht	076d4cdf37485dd8628c748975e09d29db73ab60	?
-html4/content-counter-003.htm	bab024d65a02120fa6cd0aa09637a10ed5aee69e	?
-xhtml1/content-counter-003.xht	bab024d65a02120fa6cd0aa09637a10ed5aee69e	?
-html4/content-counter-004.htm	daee752433971aed31e44b1efcfa832ac4e2afc4	?
-xhtml1/content-counter-004.xht	daee752433971aed31e44b1efcfa832ac4e2afc4	?
-html4/content-counter-005.htm	80b6192bb1de6e73df8f3912da8482454ae76435	?
-xhtml1/content-counter-005.xht	80b6192bb1de6e73df8f3912da8482454ae76435	?
-html4/content-counter-006.htm	1964bbae7185f2d0893a673a7e55dedf3275c27a	?
-xhtml1/content-counter-006.xht	1964bbae7185f2d0893a673a7e55dedf3275c27a	?
-html4/content-counter-007.htm	40cd168e5c3c4e17f8f71ae08002ef801fdbe4e2	?
-xhtml1/content-counter-007.xht	40cd168e5c3c4e17f8f71ae08002ef801fdbe4e2	?
-html4/content-counter-008.htm	dc4663bd553f4783fc026a11a47549a23195672f	?
-xhtml1/content-counter-008.xht	dc4663bd553f4783fc026a11a47549a23195672f	?
-html4/content-counter-009.htm	45b5456dec98668404d7f75e294c68b7c3c7d3a7	?
-xhtml1/content-counter-009.xht	45b5456dec98668404d7f75e294c68b7c3c7d3a7	?
-html4/content-counter-010.htm	85f277369296d43b2a97462aaad3afad419a75c5	?
-xhtml1/content-counter-010.xht	85f277369296d43b2a97462aaad3afad419a75c5	?
-html4/content-counter-011.htm	38f78d3a02140698f9f36e4e66caf7a8a114924c	?
-xhtml1/content-counter-011.xht	38f78d3a02140698f9f36e4e66caf7a8a114924c	?
-html4/content-counter-012.htm	262223d39bfdca89c0b2a5a0b6c4ff960340c04b	?
-xhtml1/content-counter-012.xht	262223d39bfdca89c0b2a5a0b6c4ff960340c04b	?
-html4/content-counter-013.htm	37fa19ffd8d1749fe27d9ca830478de18961e360	?
-xhtml1/content-counter-013.xht	37fa19ffd8d1749fe27d9ca830478de18961e360	?
-html4/content-counter-014.htm	6b618722cc4059245802209a49507d6ab259a897	?
-xhtml1/content-counter-014.xht	6b618722cc4059245802209a49507d6ab259a897	?
-html4/content-counter-015.htm	17c57dc225d1487501f391947de26e30784f174b	?
-xhtml1/content-counter-015.xht	17c57dc225d1487501f391947de26e30784f174b	?
-html4/content-counter-016.htm	0e8097ae6a831474b897f3d1bfe3ac6fe8a71a4f	?
-xhtml1/content-counter-016.xht	0e8097ae6a831474b897f3d1bfe3ac6fe8a71a4f	?
+html4/content-counter-000.htm	11a2ca2e1625c9268277f0ae67b69128862f171f	?
+xhtml1/content-counter-000.xht	11a2ca2e1625c9268277f0ae67b69128862f171f	?
+html4/content-counter-001.htm	6025d32b5faf432b7db5d2dc6a86a7f918eab347	?
+xhtml1/content-counter-001.xht	6025d32b5faf432b7db5d2dc6a86a7f918eab347	?
+html4/content-counter-002.htm	b727ca27087e54c660556698aeb4e2691fbd7f1e	?
+xhtml1/content-counter-002.xht	b727ca27087e54c660556698aeb4e2691fbd7f1e	?
+html4/content-counter-003.htm	ea6873221451dc051d7d39f57cf9590929f2b095	?
+xhtml1/content-counter-003.xht	ea6873221451dc051d7d39f57cf9590929f2b095	?
+html4/content-counter-004.htm	1804360449e7dcacd807665ec76f7cb8a082e533	?
+xhtml1/content-counter-004.xht	1804360449e7dcacd807665ec76f7cb8a082e533	?
+html4/content-counter-005.htm	e5e2dcaa12ce6c05395cc2a154faea8c346244c4	?
+xhtml1/content-counter-005.xht	e5e2dcaa12ce6c05395cc2a154faea8c346244c4	?
+html4/content-counter-006.htm	60af386f2e0b740e18fac2acd83e97eaecf691a9	?
+xhtml1/content-counter-006.xht	60af386f2e0b740e18fac2acd83e97eaecf691a9	?
+html4/content-counter-007.htm	d3ce627b17aca8abec2557640c9f35e159c02d56	?
+xhtml1/content-counter-007.xht	d3ce627b17aca8abec2557640c9f35e159c02d56	?
+html4/content-counter-008.htm	bc64d3cce436d53d0bf8166aae7b22803d6693c1	?
+xhtml1/content-counter-008.xht	bc64d3cce436d53d0bf8166aae7b22803d6693c1	?
+html4/content-counter-009.htm	a9aafc684b0e5b623ce9520c360d423ee1706dd4	?
+xhtml1/content-counter-009.xht	a9aafc684b0e5b623ce9520c360d423ee1706dd4	?
+html4/content-counter-010.htm	56813f4c1ed618619def341ed848daf47540947d	?
+xhtml1/content-counter-010.xht	56813f4c1ed618619def341ed848daf47540947d	?
+html4/content-counter-011.htm	d3c3bfb6175c84692c6419a502c1c22362955b73	?
+xhtml1/content-counter-011.xht	d3c3bfb6175c84692c6419a502c1c22362955b73	?
+html4/content-counter-012.htm	bfc02df4837b1a0bd3f01063b36d0403d516bf60	?
+xhtml1/content-counter-012.xht	bfc02df4837b1a0bd3f01063b36d0403d516bf60	?
+html4/content-counter-013.htm	4cabc3c2cd7ff5944c34c7d9d18c6883a659eff5	?
+xhtml1/content-counter-013.xht	4cabc3c2cd7ff5944c34c7d9d18c6883a659eff5	?
+html4/content-counter-014.htm	ddcd420e2e98c3d014e371ffe29f6b7c6272e345	?
+xhtml1/content-counter-014.xht	ddcd420e2e98c3d014e371ffe29f6b7c6272e345	?
+html4/content-counter-015.htm	8652857772d3cd8502a36faafb6d06c6e9fcce92	?
+xhtml1/content-counter-015.xht	8652857772d3cd8502a36faafb6d06c6e9fcce92	?
+html4/content-counter-016.htm	64fc24683094a2c4e0853961ccc603ed280e280b	?
+xhtml1/content-counter-016.xht	64fc24683094a2c4e0853961ccc603ed280e280b	?
 html4/content-counters-000.htm	37f716a432f241d959844929de83b20c6c90dffc	?
 xhtml1/content-counters-000.xht	37f716a432f241d959844929de83b20c6c90dffc	?
 html4/content-counters-001.htm	946807cce0df4e9aa9179fde59d2862b5be752bd	?
@@ -9067,8 +9069,8 @@ html4/content-counters-016.htm	8a041e883e06a9f7d449e78d0ad74e871f05f460	?
 xhtml1/content-counters-016.xht	8a041e883e06a9f7d449e78d0ad74e871f05f460	?
 html4/content-counters-017.htm	8ee8101890c572a67d83109f8888ee6ead2a7a11	?
 xhtml1/content-counters-017.xht	8ee8101890c572a67d83109f8888ee6ead2a7a11	?
-html4/content-counters-018.htm	7ebc36bcb3ce13ea5c7a302ee0f9223b63ce5f6d	?
-xhtml1/content-counters-018.xht	7ebc36bcb3ce13ea5c7a302ee0f9223b63ce5f6d	?
+html4/content-counters-018.htm	d29f8f57d8a58c07f04ff0ca2262a61512c8e01e	?
+xhtml1/content-counters-018.xht	d29f8f57d8a58c07f04ff0ca2262a61512c8e01e	?
 html4/content-inherit-001.htm	0132da54d690965b7a7351def8d7590f84163114	?
 xhtml1/content-inherit-001.xht	0132da54d690965b7a7351def8d7590f84163114	?
 html4/content-inherit-002.htm	b6b042df531374236f9bc0067496667c5e45038c	?
@@ -9091,22 +9093,22 @@ html4/content-white-space-004.htm	985d2b077592ab7e423e726b15d9784e9dc207f3	?
 xhtml1/content-white-space-004.xht	985d2b077592ab7e423e726b15d9784e9dc207f3	?
 html4/control-characters-002.htm	c7713c650b5c7708c47505b3bfc15b077239a3da	?
 xhtml1/control-characters-002.xht	c7713c650b5c7708c47505b3bfc15b077239a3da	?
-html4/core-syntax-001.htm	942e0b3950668dd1a7d9b5958e66412e59ecafbb	?
-xhtml1/core-syntax-001.xht	942e0b3950668dd1a7d9b5958e66412e59ecafbb	?
-html4/core-syntax-002.htm	8a4cb98dfcc595f7f764192ce62c871d9c94cfbb	?
-xhtml1/core-syntax-002.xht	8a4cb98dfcc595f7f764192ce62c871d9c94cfbb	?
-html4/core-syntax-003.htm	873f4b9f5d257aafffa6611d61180c93b0a50a05	?
-xhtml1/core-syntax-003.xht	873f4b9f5d257aafffa6611d61180c93b0a50a05	?
-html4/core-syntax-004.htm	e08cc6233aa06515f7f866ee87d3a7302e5ddde5	?
-xhtml1/core-syntax-004.xht	e08cc6233aa06515f7f866ee87d3a7302e5ddde5	?
-html4/core-syntax-006.htm	74a3f7993987f38e3f549eda06832ce2cc9c7e50	?
-xhtml1/core-syntax-006.xht	74a3f7993987f38e3f549eda06832ce2cc9c7e50	?
-html4/core-syntax-007.htm	04bc57ca78dcf7216a85a7a7d605023c64c1ea39	?
-xhtml1/core-syntax-007.xht	04bc57ca78dcf7216a85a7a7d605023c64c1ea39	?
-html4/core-syntax-008.htm	03b0d944a77bd154356494ff6c3aedc8b24adc0d	?
-xhtml1/core-syntax-008.xht	03b0d944a77bd154356494ff6c3aedc8b24adc0d	?
-html4/core-syntax-009.htm	839e7f814148a1dd8388f46a03e83ff5d92d4b53	?
-xhtml1/core-syntax-009.xht	839e7f814148a1dd8388f46a03e83ff5d92d4b53	?
+html4/core-syntax-001.htm	8083a54de86162213a3876de01711fb1bda55453	?
+xhtml1/core-syntax-001.xht	8083a54de86162213a3876de01711fb1bda55453	?
+html4/core-syntax-002.htm	7e37a042ce73df682857a6b4c4c94890c24cc4d9	?
+xhtml1/core-syntax-002.xht	7e37a042ce73df682857a6b4c4c94890c24cc4d9	?
+html4/core-syntax-003.htm	1fcbb868190723c21e7af574ee784217aa6a9e2a	?
+xhtml1/core-syntax-003.xht	1fcbb868190723c21e7af574ee784217aa6a9e2a	?
+html4/core-syntax-004.htm	c48a1e0d48c850e686716edbf17a8fa2ecc2c2a2	?
+xhtml1/core-syntax-004.xht	c48a1e0d48c850e686716edbf17a8fa2ecc2c2a2	?
+html4/core-syntax-006.htm	094571a3d3d620642722fa494259ee46d718abab	?
+xhtml1/core-syntax-006.xht	094571a3d3d620642722fa494259ee46d718abab	?
+html4/core-syntax-007.htm	d6a2644d5ffff6a813bf16218760610e35b15a9d	?
+xhtml1/core-syntax-007.xht	d6a2644d5ffff6a813bf16218760610e35b15a9d	?
+html4/core-syntax-008.htm	bbcab0c5f9c6e255999b84544cc685740ae5cc85	?
+xhtml1/core-syntax-008.xht	bbcab0c5f9c6e255999b84544cc685740ae5cc85	?
+html4/core-syntax-009.htm	076d16691c7b45f55ff243c92db47980147260eb	?
+xhtml1/core-syntax-009.xht	076d16691c7b45f55ff243c92db47980147260eb	?
 html4/counter-increment-000.htm	98bf04bbbc1c567e751a0ff86f3d02e2a8bbb538	?
 xhtml1/counter-increment-000.xht	98bf04bbbc1c567e751a0ff86f3d02e2a8bbb538	?
 html4/counter-increment-001.htm	ff216513d622f9b04a7824cc4a717966264e4bd1	?
@@ -9431,26 +9433,26 @@ html4/counter-reset-sibling-001.htm	66345146613b01479d3e2fc77d57f0463fa8a5b9	?
 xhtml1/counter-reset-sibling-001.xht	66345146613b01479d3e2fc77d57f0463fa8a5b9	?
 html4/counter-reset-visibility-001.htm	1cab5174ffa04bd5d112e94f17489e418464073d	?
 xhtml1/counter-reset-visibility-001.xht	1cab5174ffa04bd5d112e94f17489e418464073d	?
-html4/counters-001.htm	6113e3ff9dd80acb041d2da3dfcd9e31037cb675	?
-xhtml1/counters-001.xht	6113e3ff9dd80acb041d2da3dfcd9e31037cb675	?
+html4/counters-001.htm	3e07ae612bfb6ac4fce69746122108a28f80e11e	?
+xhtml1/counters-001.xht	3e07ae612bfb6ac4fce69746122108a28f80e11e	?
 html4/counters-002.htm	8bd15cebb49e35998d688a75c414ad46232a9a4d	?
 xhtml1/counters-002.xht	8bd15cebb49e35998d688a75c414ad46232a9a4d	?
-html4/counters-003.htm	a9652d5d44b11fff426413a138b9f7565805eca3	?
-xhtml1/counters-003.xht	a9652d5d44b11fff426413a138b9f7565805eca3	?
-html4/counters-004.htm	ca6b735e6c15b5fc114953b4d5d0bebeb5c8d2af	?
-xhtml1/counters-004.xht	ca6b735e6c15b5fc114953b4d5d0bebeb5c8d2af	?
-html4/counters-005.htm	a161572ada1da0d5d4cca30acbf07dde32431290	?
-xhtml1/counters-005.xht	a161572ada1da0d5d4cca30acbf07dde32431290	?
-html4/counters-006.htm	10077d6c77ffff9afde9bcc8a6adf7a72648e973	?
-xhtml1/counters-006.xht	10077d6c77ffff9afde9bcc8a6adf7a72648e973	?
-html4/counters-007.htm	ba41778ba917abc0cdbf4c14263f482adb2aa79a	?
-xhtml1/counters-007.xht	ba41778ba917abc0cdbf4c14263f482adb2aa79a	?
-html4/counters-008.htm	516cb34d33ff0cea02072a06ffad392d8daca7a4	?
-xhtml1/counters-008.xht	516cb34d33ff0cea02072a06ffad392d8daca7a4	?
-html4/counters-009.htm	fc91b50078a544326b295f6821be28341c348f5b	?
-xhtml1/counters-009.xht	fc91b50078a544326b295f6821be28341c348f5b	?
-html4/counters-010.htm	60ba9f330132aca869796db6f27fbccad2f0b16d	?
-xhtml1/counters-010.xht	60ba9f330132aca869796db6f27fbccad2f0b16d	?
+html4/counters-003.htm	bcbed4c9e500741ac0c9bc9f28b9f87640adf2d3	?
+xhtml1/counters-003.xht	bcbed4c9e500741ac0c9bc9f28b9f87640adf2d3	?
+html4/counters-004.htm	db4d1f67d03c13cafc3526f1856c68163f1638c0	?
+xhtml1/counters-004.xht	db4d1f67d03c13cafc3526f1856c68163f1638c0	?
+html4/counters-005.htm	720be39020ed3460c26dd76fff76c7bca9f06604	?
+xhtml1/counters-005.xht	720be39020ed3460c26dd76fff76c7bca9f06604	?
+html4/counters-006.htm	9c345f1079b63c64ac919d2fd6f008c83af57621	?
+xhtml1/counters-006.xht	9c345f1079b63c64ac919d2fd6f008c83af57621	?
+html4/counters-007.htm	5a16289544caa4a3faa3c5e3b9fe9898d6b22452	?
+xhtml1/counters-007.xht	5a16289544caa4a3faa3c5e3b9fe9898d6b22452	?
+html4/counters-008.htm	67557c4f4821dee22661612563235c42d98eb6d9	?
+xhtml1/counters-008.xht	67557c4f4821dee22661612563235c42d98eb6d9	?
+html4/counters-009.htm	06082522a1b91e8fcdcc28caad73ccead4612db1	?
+xhtml1/counters-009.xht	06082522a1b91e8fcdcc28caad73ccead4612db1	?
+html4/counters-010.htm	8e39dea6b9daf37c22c21928909a5d60e9d09971	?
+xhtml1/counters-010.xht	8e39dea6b9daf37c22c21928909a5d60e9d09971	?
 html4/counters-hidden-000.htm	bd9d69c668a4c34ef908773dec75e9d9b23217bc	?
 xhtml1/counters-hidden-000.xht	bd9d69c668a4c34ef908773dec75e9d9b23217bc	?
 html4/counters-hidden-001.htm	90badbb3c30aeb489a7b10f814c475f19a44873b	?
@@ -9573,22 +9575,22 @@ html4/data-alignment-003.htm	1a48d3387129d1a110ed012c79bb4fbbb19356f2	?
 xhtml1/data-alignment-003.xht	1a48d3387129d1a110ed012c79bb4fbbb19356f2	?
 html4/data-alignment-004.htm	44a7310baace02501053a401a43a15af6dc56c07	?
 xhtml1/data-alignment-004.xht	44a7310baace02501053a401a43a15af6dc56c07	?
-html4/declaration-001.htm	095c86373e6d5d590c0a6375c4985fae6643b580	?
-xhtml1/declaration-001.xht	095c86373e6d5d590c0a6375c4985fae6643b580	?
-html4/declaration-002.htm	adfb129e5f9603546eed178060d6291b0bb46fc8	?
-xhtml1/declaration-002.xht	adfb129e5f9603546eed178060d6291b0bb46fc8	?
-html4/declaration-003.htm	3467772ab02d8cf4f6e8db92d67f78a45c5a08ed	?
-xhtml1/declaration-003.xht	3467772ab02d8cf4f6e8db92d67f78a45c5a08ed	?
-html4/declaration-004.htm	5f903bc94910a17cf54455d842220d5576e517d3	?
-xhtml1/declaration-004.xht	5f903bc94910a17cf54455d842220d5576e517d3	?
-html4/declaration-005.htm	95db203b752dcabadbd37613cef6197d35df06e8	?
-xhtml1/declaration-005.xht	95db203b752dcabadbd37613cef6197d35df06e8	?
-html4/declaration-006.htm	3b453f15b1e5032f219e2f01634dd45ef92db5a7	?
-xhtml1/declaration-006.xht	3b453f15b1e5032f219e2f01634dd45ef92db5a7	?
+html4/declaration-001.htm	1af32cb684b11037144de9919d9859ba02764ad1	?
+xhtml1/declaration-001.xht	1af32cb684b11037144de9919d9859ba02764ad1	?
+html4/declaration-002.htm	a48e24b0d9191620333018e11ff46799978e9f87	?
+xhtml1/declaration-002.xht	a48e24b0d9191620333018e11ff46799978e9f87	?
+html4/declaration-003.htm	72845a03c759b28ecc8cf33d5ec06eb4e9b681f6	?
+xhtml1/declaration-003.xht	72845a03c759b28ecc8cf33d5ec06eb4e9b681f6	?
+html4/declaration-004.htm	83e2fd179cff2a88af05454e454dd4497f945f1a	?
+xhtml1/declaration-004.xht	83e2fd179cff2a88af05454e454dd4497f945f1a	?
+html4/declaration-005.htm	3e1dfb793750423037cbdbdc5cb2a6d554601690	?
+xhtml1/declaration-005.xht	3e1dfb793750423037cbdbdc5cb2a6d554601690	?
+html4/declaration-006.htm	9bf6509156021a455a0d7253827efef3ca5f16fd	?
+xhtml1/declaration-006.xht	9bf6509156021a455a0d7253827efef3ca5f16fd	?
 html4/declaration-whitespace-001.htm	79fca0c7e336d7a18f329e98541010ecf2360266	?
 xhtml1/declaration-whitespace-001.xht	79fca0c7e336d7a18f329e98541010ecf2360266	?
-html4/declarations-009.htm	8658b351e7b0b401d301940dfe5d6599e1e7fd00	?
-xhtml1/declarations-009.xht	8658b351e7b0b401d301940dfe5d6599e1e7fd00	?
+html4/declarations-009.htm	a005a9b38569d3fab5961e163e9b08e1430b90e5	?
+xhtml1/declarations-009.xht	a005a9b38569d3fab5961e163e9b08e1430b90e5	?
 html4/default-attribute-selector-001.htm	88e74e354d85ae30af28b990fe3e0731a24a9f9e	?
 xhtml1/default-attribute-selector-001.xht	88e74e354d85ae30af28b990fe3e0731a24a9f9e	?
 html4/default-attribute-selector-002.htm	511e185ad1b86f7540f3b1e4f1047e6648caf72e	?
@@ -9947,38 +9949,38 @@ html4/escaped-ident-spaces-006.htm	20509dc4fea583128da4f44c1426197b4f8180be	?
 xhtml1/escaped-ident-spaces-006.xht	20509dc4fea583128da4f44c1426197b4f8180be	?
 html4/escaped-ident-spaces-007.htm	e5126ef7aba00fa9b87ca64194364c22d198cdd8	?
 xhtml1/escaped-ident-spaces-007.xht	e5126ef7aba00fa9b87ca64194364c22d198cdd8	?
-html4/escaped-newline-001.htm	a368ccece9c652696c5c144c1aa0fecb29927f9b	?
-xhtml1/escaped-newline-001.xht	a368ccece9c652696c5c144c1aa0fecb29927f9b	?
-html4/escapes-000.htm	950750c0a62615691fbccbe9817c3837801f1e5d	?
-xhtml1/escapes-000.xht	950750c0a62615691fbccbe9817c3837801f1e5d	?
-html4/escapes-001.htm	d5ceb1f6427ee387f1149363c021778253f4af4b	?
-xhtml1/escapes-001.xht	d5ceb1f6427ee387f1149363c021778253f4af4b	?
-html4/escapes-002.htm	19d446880071eac7f3a283faaa8b2be4ed6c00bb	?
-xhtml1/escapes-002.xht	19d446880071eac7f3a283faaa8b2be4ed6c00bb	?
-html4/escapes-003.htm	a44df61ff5ec58a376a57f02e7d5ec3f31e21097	?
-xhtml1/escapes-003.xht	a44df61ff5ec58a376a57f02e7d5ec3f31e21097	?
-html4/escapes-004.htm	2044a1591ec93198c3629aba577bb6be3440f6f4	?
-xhtml1/escapes-004.xht	2044a1591ec93198c3629aba577bb6be3440f6f4	?
-html4/escapes-005.htm	81d4490ba64d770fcfa0b8c5559791579bd828c6	?
-xhtml1/escapes-005.xht	81d4490ba64d770fcfa0b8c5559791579bd828c6	?
-html4/escapes-006.htm	80c6ff44e60b689371740f7fba2f3e72eedb4f8f	?
-xhtml1/escapes-006.xht	80c6ff44e60b689371740f7fba2f3e72eedb4f8f	?
-html4/escapes-007.htm	5ca266b170e970cc8ea0660566604f2e61902d8f	?
-xhtml1/escapes-007.xht	5ca266b170e970cc8ea0660566604f2e61902d8f	?
-html4/escapes-008.htm	3c8fc7a7952f1171c4eed730d7f5d1ba1216245a	?
-xhtml1/escapes-008.xht	3c8fc7a7952f1171c4eed730d7f5d1ba1216245a	?
-html4/escapes-009.htm	89b902b38bab3b08e1cb17ea3b6dca6723266935	?
-xhtml1/escapes-009.xht	89b902b38bab3b08e1cb17ea3b6dca6723266935	?
-html4/escapes-010.htm	1ddd0a4a4728e568964eca1de5d6352750123bbb	?
-xhtml1/escapes-010.xht	1ddd0a4a4728e568964eca1de5d6352750123bbb	?
-html4/escapes-011.htm	975b36ea9fd479b417f9f0c4043060cdf8997cbc	?
-xhtml1/escapes-011.xht	975b36ea9fd479b417f9f0c4043060cdf8997cbc	?
-html4/escapes-012.htm	97948177ce7772c8da43f42ce82b4bf486d72246	?
-xhtml1/escapes-012.xht	97948177ce7772c8da43f42ce82b4bf486d72246	?
-html4/escapes-013.htm	1cbdd257d40a391f8f01042a67c39d5b7e035640	?
-xhtml1/escapes-013.xht	1cbdd257d40a391f8f01042a67c39d5b7e035640	?
-html4/escapes-014.htm	ce2455f035a28eb71da0e971b3b040211ec1b035	?
-xhtml1/escapes-014.xht	ce2455f035a28eb71da0e971b3b040211ec1b035	?
+html4/escaped-newline-001.htm	268c0cf7c468e19c41672de080ce0b8554d99e84	?
+xhtml1/escaped-newline-001.xht	268c0cf7c468e19c41672de080ce0b8554d99e84	?
+html4/escapes-000.htm	0c9b15c13867af28ba7627b2147ee71e0a3e9728	?
+xhtml1/escapes-000.xht	0c9b15c13867af28ba7627b2147ee71e0a3e9728	?
+html4/escapes-001.htm	009f1fe3b2a45bba323a8e3e85adc84b62e956e1	?
+xhtml1/escapes-001.xht	009f1fe3b2a45bba323a8e3e85adc84b62e956e1	?
+html4/escapes-002.htm	748487bd6c6c4e64fd38c7d372301b12e286a946	?
+xhtml1/escapes-002.xht	748487bd6c6c4e64fd38c7d372301b12e286a946	?
+html4/escapes-003.htm	4ce7aa20feeec08352882fc93e323bc4ea23b460	?
+xhtml1/escapes-003.xht	4ce7aa20feeec08352882fc93e323bc4ea23b460	?
+html4/escapes-004.htm	d4068fae5f1eb8df74c4f4a5005f32700e4fec7f	?
+xhtml1/escapes-004.xht	d4068fae5f1eb8df74c4f4a5005f32700e4fec7f	?
+html4/escapes-005.htm	55ab91fc51ab6aeddd318eb651c0eb5f818edb4b	?
+xhtml1/escapes-005.xht	55ab91fc51ab6aeddd318eb651c0eb5f818edb4b	?
+html4/escapes-006.htm	b44fb0e8f34dc4862cb13c99a3237003f45126b8	?
+xhtml1/escapes-006.xht	b44fb0e8f34dc4862cb13c99a3237003f45126b8	?
+html4/escapes-007.htm	f7a619dd23a75b066c0c84163df4c9c44b869f56	?
+xhtml1/escapes-007.xht	f7a619dd23a75b066c0c84163df4c9c44b869f56	?
+html4/escapes-008.htm	51e676c8a404d28237d4746f4332c5e856a47d6b	?
+xhtml1/escapes-008.xht	51e676c8a404d28237d4746f4332c5e856a47d6b	?
+html4/escapes-009.htm	ba720024df5d6762fd2a214abc52a6d7072c3522	?
+xhtml1/escapes-009.xht	ba720024df5d6762fd2a214abc52a6d7072c3522	?
+html4/escapes-010.htm	73281d5ae3869cd1c4f2bc56b79490fc4dbef993	?
+xhtml1/escapes-010.xht	73281d5ae3869cd1c4f2bc56b79490fc4dbef993	?
+html4/escapes-011.htm	7380a6e19656ccb8da7a2901d8574eb4b33e18e1	?
+xhtml1/escapes-011.xht	7380a6e19656ccb8da7a2901d8574eb4b33e18e1	?
+html4/escapes-012.htm	aaa1df5a039befac89a20dfa17fc331c1152071d	?
+xhtml1/escapes-012.xht	aaa1df5a039befac89a20dfa17fc331c1152071d	?
+html4/escapes-013.htm	209146dd1aa589b1783449b32d3a11d533042cc4	?
+xhtml1/escapes-013.xht	209146dd1aa589b1783449b32d3a11d533042cc4	?
+html4/escapes-014.htm	6f22915c4033d70149cb9fe614e2b4faf8f8ec96	?
+xhtml1/escapes-014.xht	6f22915c4033d70149cb9fe614e2b4faf8f8ec96	?
 html4/escapes-015.htm	bb02c8dd729b3f9f049efe308d7b4919ff5ce68d	?
 xhtml1/escapes-015.xht	bb02c8dd729b3f9f049efe308d7b4919ff5ce68d	?
 html4/escapes-016.htm	b0598aa61a40521b50a1affc0d0aad59ec12a8fe	?
@@ -11015,8 +11017,8 @@ html4/first-page-selectors-004.htm	a5c1fb528f5b5f17a57c65056d00504d3813cbef	?
 xhtml1/first-page-selectors-004.xht	a5c1fb528f5b5f17a57c65056d00504d3813cbef	?
 html4/first-page-vlr-003.htm	ba9f62a92fda53555211ee1de1a17cb08e124dd6	?
 xhtml1/first-page-vlr-003.xht	ba9f62a92fda53555211ee1de1a17cb08e124dd6	?
-html4/first-page-vrl-002.htm	0e3999276064df4aff359983d7a6cb2977a7a19b	?
-xhtml1/first-page-vrl-002.xht	0e3999276064df4aff359983d7a6cb2977a7a19b	?
+html4/first-page-vrl-002.htm	d889dab856e4fad4d820153f78921a043b28589d	?
+xhtml1/first-page-vrl-002.xht	d889dab856e4fad4d820153f78921a043b28589d	?
 html4/fixed-table-layout-001.htm	72b5ea78d6b5c107cbee06057efd23f277284710	?
 xhtml1/fixed-table-layout-001.xht	72b5ea78d6b5c107cbee06057efd23f277284710	?
 html4/fixed-table-layout-002.htm	ec1814f346b834600c51b0b4ca6b0b761d13ba96	?
@@ -11761,14 +11763,14 @@ html4/font-family-invalid-characters-001.htm	449eb0f3295627f65a6386400d771ca86f4
 xhtml1/font-family-invalid-characters-001.xht	449eb0f3295627f65a6386400d771ca86f454c6c	?
 html4/font-family-invalid-characters-002.htm	3d59693705c06a2105e9c32be950462108394a47	?
 xhtml1/font-family-invalid-characters-002.xht	3d59693705c06a2105e9c32be950462108394a47	?
-html4/font-family-invalid-characters-003.htm	836b64a69397022366fd721fcab1aedbd869340c	?
-xhtml1/font-family-invalid-characters-003.xht	836b64a69397022366fd721fcab1aedbd869340c	?
-html4/font-family-invalid-characters-004.htm	81c2353fba8bbbb408acbc6272951d9a22e9d0b5	?
-xhtml1/font-family-invalid-characters-004.xht	81c2353fba8bbbb408acbc6272951d9a22e9d0b5	?
-html4/font-family-invalid-characters-005.htm	e8cd099e08c9e29876015789d990e1a41126c7c7	?
-xhtml1/font-family-invalid-characters-005.xht	e8cd099e08c9e29876015789d990e1a41126c7c7	?
-html4/font-family-invalid-characters-006.htm	cbf2d4c8d6741038958506728525039b584cedf9	?
-xhtml1/font-family-invalid-characters-006.xht	cbf2d4c8d6741038958506728525039b584cedf9	?
+html4/font-family-invalid-characters-003.htm	f97a9ef862be0c3008aa6684956be102012953d3	?
+xhtml1/font-family-invalid-characters-003.xht	f97a9ef862be0c3008aa6684956be102012953d3	?
+html4/font-family-invalid-characters-004.htm	fe90154e0074f886663b9b9e7a8ae3d0fcb536f2	?
+xhtml1/font-family-invalid-characters-004.xht	fe90154e0074f886663b9b9e7a8ae3d0fcb536f2	?
+html4/font-family-invalid-characters-005.htm	5024d4008e25d8c9bdc41fbe60ee41040d4f6819	?
+xhtml1/font-family-invalid-characters-005.xht	5024d4008e25d8c9bdc41fbe60ee41040d4f6819	?
+html4/font-family-invalid-characters-006.htm	825885808c4250ef0babc9fed4f49577e8b7de20	?
+xhtml1/font-family-invalid-characters-006.xht	825885808c4250ef0babc9fed4f49577e8b7de20	?
 html4/font-family-name-001.htm	7b14f6d140576152871525a8f532383679e60e50	?
 xhtml1/font-family-name-001.xht	7b14f6d140576152871525a8f532383679e60e50	?
 html4/font-family-name-002.htm	4d882507a40bb4db9fd5acc74fc6b725e7053ef8	?
@@ -12592,34 +12594,34 @@ html4/id-selector-005.htm	1bd9f836f45d52bafde0199eff7f47086d979f72	?
 xhtml1/id-selector-005.xht	1bd9f836f45d52bafde0199eff7f47086d979f72	?
 html4/id-selector-006.htm	fd8cd5725804469be3f3dc5b1f80830a4c700a9c	?
 xhtml1/id-selector-006.xht	fd8cd5725804469be3f3dc5b1f80830a4c700a9c	?
-html4/ident-000.htm	dcae4e85d912de68a032922c5c66ee3b5d5b0523	?
-xhtml1/ident-000.xht	dcae4e85d912de68a032922c5c66ee3b5d5b0523	?
-html4/ident-001.htm	745ae4e09f214376e2beb7fbe9ffd7233023a549	?
-xhtml1/ident-001.xht	745ae4e09f214376e2beb7fbe9ffd7233023a549	?
-html4/ident-002.htm	8701e48995c2348341a2c9e877f99b7a66089e05	?
-xhtml1/ident-002.xht	8701e48995c2348341a2c9e877f99b7a66089e05	?
-html4/ident-003.htm	e13774e8d08acd5dc9b28321c8e601d6a843dfcc	?
-xhtml1/ident-003.xht	e13774e8d08acd5dc9b28321c8e601d6a843dfcc	?
-html4/ident-004.htm	5ccdee8f236f708b5e153fc722770b7a2524353d	?
-xhtml1/ident-004.xht	5ccdee8f236f708b5e153fc722770b7a2524353d	?
-html4/ident-005.htm	1565aad55801206cd10f882d59ad4de53bb703dc	?
-xhtml1/ident-005.xht	1565aad55801206cd10f882d59ad4de53bb703dc	?
-html4/ident-006.htm	f407a0a4ac737b97e811063ca0a114e293c0eba6	?
-xhtml1/ident-006.xht	f407a0a4ac737b97e811063ca0a114e293c0eba6	?
-html4/ident-007.htm	c3f5dae0988bdfa89f232ccc132fc2c2aa82b43c	?
-xhtml1/ident-007.xht	c3f5dae0988bdfa89f232ccc132fc2c2aa82b43c	?
-html4/ident-008.htm	0142dd6870b7bba63fc29d0ace1c873d37ac89c1	?
-xhtml1/ident-008.xht	0142dd6870b7bba63fc29d0ace1c873d37ac89c1	?
-html4/ident-009.htm	19c2292cecce556dc053fa482ed4a28e0b279822	?
-xhtml1/ident-009.xht	19c2292cecce556dc053fa482ed4a28e0b279822	?
-html4/ident-010.htm	8f9b399208d344879a35f609e714c031593ee10d	?
-xhtml1/ident-010.xht	8f9b399208d344879a35f609e714c031593ee10d	?
-html4/ident-011.htm	de2d4d2391df6b8948fc735dc227bd773e3942d1	?
-xhtml1/ident-011.xht	de2d4d2391df6b8948fc735dc227bd773e3942d1	?
-html4/ident-012.htm	fa3a2f65c5b23a08e8b6ae17c4c29ec28b32f1b8	?
-xhtml1/ident-012.xht	fa3a2f65c5b23a08e8b6ae17c4c29ec28b32f1b8	?
-html4/ident-013.htm	c7ec0a330fc58da86312c1d38ca96371991965c5	?
-xhtml1/ident-013.xht	c7ec0a330fc58da86312c1d38ca96371991965c5	?
+html4/ident-000.htm	a5bb017aac09549e58259b2eeb0d3eb04f49c485	?
+xhtml1/ident-000.xht	a5bb017aac09549e58259b2eeb0d3eb04f49c485	?
+html4/ident-001.htm	d3a3583374a41cfea69171d7a73d7f9ab446502a	?
+xhtml1/ident-001.xht	d3a3583374a41cfea69171d7a73d7f9ab446502a	?
+html4/ident-002.htm	a0f1d3ed5a31e6c16f0b724778057e1915af7811	?
+xhtml1/ident-002.xht	a0f1d3ed5a31e6c16f0b724778057e1915af7811	?
+html4/ident-003.htm	575ca9e2213998b097eeb5e85b18dbd7f9bd2559	?
+xhtml1/ident-003.xht	575ca9e2213998b097eeb5e85b18dbd7f9bd2559	?
+html4/ident-004.htm	110a73bc1583318423eaf2a493185233abccd705	?
+xhtml1/ident-004.xht	110a73bc1583318423eaf2a493185233abccd705	?
+html4/ident-005.htm	edb839271da978d74b592b2942a84fc0c4fbc24e	?
+xhtml1/ident-005.xht	edb839271da978d74b592b2942a84fc0c4fbc24e	?
+html4/ident-006.htm	28b396799100707a2ea898d34d5033f5e14e47a4	?
+xhtml1/ident-006.xht	28b396799100707a2ea898d34d5033f5e14e47a4	?
+html4/ident-007.htm	09f023333c98f8a6709cd99f90f7a45fa271202a	?
+xhtml1/ident-007.xht	09f023333c98f8a6709cd99f90f7a45fa271202a	?
+html4/ident-008.htm	42583189992d7bbd39af2647d717d5d1a1d8d31b	?
+xhtml1/ident-008.xht	42583189992d7bbd39af2647d717d5d1a1d8d31b	?
+html4/ident-009.htm	92f0fc52bb856d3e73bc6926f6d889ff6c1aae96	?
+xhtml1/ident-009.xht	92f0fc52bb856d3e73bc6926f6d889ff6c1aae96	?
+html4/ident-010.htm	da0270119dd4eb6a3460d7ff6d020188f6921693	?
+xhtml1/ident-010.xht	da0270119dd4eb6a3460d7ff6d020188f6921693	?
+html4/ident-011.htm	1ca29775a384976a67f7fcc7af1eb44db370f38f	?
+xhtml1/ident-011.xht	1ca29775a384976a67f7fcc7af1eb44db370f38f	?
+html4/ident-012.htm	ae7afb4f1969ab07e5ec9342400d47c5e43e126c	?
+xhtml1/ident-012.xht	ae7afb4f1969ab07e5ec9342400d47c5e43e126c	?
+html4/ident-013.htm	f94b46735cf5432ef144c6a8763cea18c8dce62c	?
+xhtml1/ident-013.xht	f94b46735cf5432ef144c6a8763cea18c8dce62c	?
 html4/ident-014.htm	7bd28b7622cdea65b4f7f5bf91064098f9f4e7fd	?
 xhtml1/ident-014.xht	7bd28b7622cdea65b4f7f5bf91064098f9f4e7fd	?
 html4/ident-015.htm	a1137fa2d4ed1ae9e4911a24424ce267ab15bd88	?
@@ -12632,8 +12634,8 @@ html4/ident-018.htm	02a41a155963221822aee765d06bde083016e86a	?
 xhtml1/ident-018.xht	02a41a155963221822aee765d06bde083016e86a	?
 html4/ident-019.htm	f9a74db3a0d526452c719fab4a5c63c613307c7f	?
 xhtml1/ident-019.xht	f9a74db3a0d526452c719fab4a5c63c613307c7f	?
-html4/ident-020.htm	7951aa45f6a7be3d5e62dabc08f352946fbb21c0	?
-xhtml1/ident-020.xht	7951aa45f6a7be3d5e62dabc08f352946fbb21c0	?
+html4/ident-020.htm	6d6e06fe5ec1a32266d1281c625dce2125ec208e	?
+xhtml1/ident-020.xht	6d6e06fe5ec1a32266d1281c625dce2125ec208e	?
 html4/ignored-rules-001.htm	0b866d1222cf23f35f26d238726d15273fcc1eff	?
 xhtml1/ignored-rules-001.xht	0b866d1222cf23f35f26d238726d15273fcc1eff	?
 html4/ignored-rules-002.htm	7dfe293b2660f3fbc2de570da2c3088b70bbee58	?
@@ -12648,10 +12650,10 @@ html4/ignored-rules-006.htm	196120bb28d7e792e8fcf7c9031b247572463ea1	?
 xhtml1/ignored-rules-006.xht	196120bb28d7e792e8fcf7c9031b247572463ea1	?
 html4/ignored-rules-007.htm	b590bc0c33459102d1126ee05a71d93f2f827f77	?
 xhtml1/ignored-rules-007.xht	b590bc0c33459102d1126ee05a71d93f2f827f77	?
-html4/import-000.htm	99ff37ee72125d91c011488bddee11c6bc89f86b	?
-xhtml1/import-000.xht	99ff37ee72125d91c011488bddee11c6bc89f86b	?
-html4/import-001.htm	5f00643723cdda27a0cfd53cf73f2f8ac606dfad	?
-xhtml1/import-001.xht	5f00643723cdda27a0cfd53cf73f2f8ac606dfad	?
+html4/import-000.htm	56ed95eb4f2eb7c3e86f1a5dc454fa17a3fbb3db	?
+xhtml1/import-000.xht	56ed95eb4f2eb7c3e86f1a5dc454fa17a3fbb3db	?
+html4/import-001.htm	1e5637c6ea1964529b035f164d6961b50d3bf09a	?
+xhtml1/import-001.xht	1e5637c6ea1964529b035f164d6961b50d3bf09a	?
 html4/increment-counter-001.htm	74a28d6f4e346a5a00c255b34163b80b03353669	?
 xhtml1/increment-counter-001.xht	74a28d6f4e346a5a00c255b34163b80b03353669	?
 html4/inherit-001.htm	4435a6e6308b23056f4e1faadba15463a600ede0	?
@@ -13016,10 +13018,10 @@ html4/invalid-decl-at-rule-001.htm	efb9d55d7f93952ef508ec660f572397fdcececd	?
 xhtml1/invalid-decl-at-rule-001.xht	efb9d55d7f93952ef508ec660f572397fdcececd	?
 html4/invalid-decl-at-rule-002.htm	18333853d45725f63cfc9ac8c77ccf8019fbd6a0	?
 xhtml1/invalid-decl-at-rule-002.xht	18333853d45725f63cfc9ac8c77ccf8019fbd6a0	?
-html4/keywords-000.htm	d5397cb7d5a72715ad50c65efa8fbfa4d8552c6d	?
-xhtml1/keywords-000.xht	d5397cb7d5a72715ad50c65efa8fbfa4d8552c6d	?
-html4/keywords-001.htm	ebc0dd14fa063fa86bbbd873b76579db593bb1b6	?
-xhtml1/keywords-001.xht	ebc0dd14fa063fa86bbbd873b76579db593bb1b6	?
+html4/keywords-000.htm	357b9fbfad6de9a3954d1b74132546939b2ab969	?
+xhtml1/keywords-000.xht	357b9fbfad6de9a3954d1b74132546939b2ab969	?
+html4/keywords-001.htm	13c37f2ae37cf36c4c63e048fda5b7e634131c79	?
+xhtml1/keywords-001.xht	13c37f2ae37cf36c4c63e048fda5b7e634131c79	?
 html4/lang-pseudoclass-001.htm	8c18cfa29028ff4f8dc0f6c8bbcb47aa62b41176	?
 xhtml1/lang-pseudoclass-002.xht	7ff7a233c03f8673acf91b885456e645211ffc3d	?
 html4/lang-selector-001.htm	c62deff2754cdf81bc55ed4873786125c1378759	?
@@ -13566,8 +13568,8 @@ html4/list-style-018.htm	7e422e3ef292376e90e5192bcd3295353e942f14	?
 xhtml1/list-style-018.xht	7e422e3ef292376e90e5192bcd3295353e942f14	?
 html4/list-style-019.htm	8de761b8a29f13d33dc7c01ae235ac946a520245	?
 xhtml1/list-style-019.xht	8de761b8a29f13d33dc7c01ae235ac946a520245	?
-html4/list-style-020.htm	792ef31f35f133e75c2b906a2b5ddbda8be7b7bd	?
-xhtml1/list-style-020.xht	792ef31f35f133e75c2b906a2b5ddbda8be7b7bd	?
+html4/list-style-020.htm	7d2ccfdc51e1c488c3a51f2cabd19c744470329b	?
+xhtml1/list-style-020.xht	7d2ccfdc51e1c488c3a51f2cabd19c744470329b	?
 html4/list-style-021.htm	ba85cbb037f474a7e9333ebab0599d4b2750acdd	?
 xhtml1/list-style-021.xht	ba85cbb037f474a7e9333ebab0599d4b2750acdd	?
 html4/list-style-applies-to-001.htm	a5a72e9c84e14d48ac4381d63cdd1b55d30eb1c9	?
@@ -14665,12 +14667,12 @@ html4/margin-top-applies-to-015.htm	1bf6a218fa8d325b9a55d0166f933420622dcbeb	?
 xhtml1/margin-top-applies-to-015.xht	1bf6a218fa8d325b9a55d0166f933420622dcbeb	?
 html4/markers-rtl-001.htm	93a5ddaefbdba92fba785f4dcd9a7dc1c1eec4a5	?
 xhtml1/markers-rtl-001.xht	93a5ddaefbdba92fba785f4dcd9a7dc1c1eec4a5	?
-html4/matching-brackets-001.htm	facae6b02dfba602e9064b68b5e163c8a1c76cd9	?
-xhtml1/matching-brackets-001.xht	facae6b02dfba602e9064b68b5e163c8a1c76cd9	?
-html4/matching-brackets-002.htm	ce3d692e67e7ca12b7bfadde6e12af19092390a4	?
-xhtml1/matching-brackets-002.xht	ce3d692e67e7ca12b7bfadde6e12af19092390a4	?
-html4/matching-brackets-003.htm	df372c5402e2d0793db596947c5157448aee677d	?
-xhtml1/matching-brackets-003.xht	df372c5402e2d0793db596947c5157448aee677d	?
+html4/matching-brackets-001.htm	5c561bfd8523fa69b41b5bde8bab391d9af7695b	?
+xhtml1/matching-brackets-001.xht	5c561bfd8523fa69b41b5bde8bab391d9af7695b	?
+html4/matching-brackets-002.htm	40aa7c8bdb4c8f5be2697718e89a9de4ec34b771	?
+xhtml1/matching-brackets-002.xht	40aa7c8bdb4c8f5be2697718e89a9de4ec34b771	?
+html4/matching-brackets-003.htm	1f08f3cd0afdd687abfc93a66d1d139b90906e8b	?
+xhtml1/matching-brackets-003.xht	1f08f3cd0afdd687abfc93a66d1d139b90906e8b	?
 html4/max-height-001.htm	2bd8cdd11cef083ddeec6f37cf73b655577f0c5c	?
 xhtml1/max-height-001.xht	2bd8cdd11cef083ddeec6f37cf73b655577f0c5c	?
 html4/max-height-002.htm	34f58e49e33d41ab4de3703b07f0f4ec91a67d8d	?
@@ -15537,36 +15539,36 @@ html4/numbers-units-002.htm	42b2756b7ca2b27dafa3013671505e81c6d37d7c	?
 xhtml1/numbers-units-002.xht	42b2756b7ca2b27dafa3013671505e81c6d37d7c	?
 html4/numbers-units-003.htm	8a8960ac1523a63abbc10e9b248d8b0c82ed77c0	?
 xhtml1/numbers-units-003.xht	8a8960ac1523a63abbc10e9b248d8b0c82ed77c0	?
-html4/numbers-units-004.htm	561dac2f8f4e459b6f4c9930d1fee532608ceb97	?
-xhtml1/numbers-units-004.xht	561dac2f8f4e459b6f4c9930d1fee532608ceb97	?
+html4/numbers-units-004.htm	74ad99000f507e14fe02517ad0b9e02d1ecc5d29	?
+xhtml1/numbers-units-004.xht	74ad99000f507e14fe02517ad0b9e02d1ecc5d29	?
 html4/numbers-units-005.htm	e14faa0e3573ee2ca5c0d46f6850551029ae4498	?
 xhtml1/numbers-units-005.xht	e14faa0e3573ee2ca5c0d46f6850551029ae4498	?
-html4/numbers-units-006.htm	e75352dbfd47da1233ede4c4ac9a41ed89435167	?
-xhtml1/numbers-units-006.xht	e75352dbfd47da1233ede4c4ac9a41ed89435167	?
-html4/numbers-units-007.htm	8945a06e794fd09f93f975f1142f06fed6b4d1fb	?
-xhtml1/numbers-units-007.xht	8945a06e794fd09f93f975f1142f06fed6b4d1fb	?
-html4/numbers-units-009.htm	3eb2cc524bdf7a01643f112b0df58344409d4109	?
-xhtml1/numbers-units-009.xht	3eb2cc524bdf7a01643f112b0df58344409d4109	?
-html4/numbers-units-010.htm	544216b4b754c48bd39f163335c74ca642d05b48	?
-xhtml1/numbers-units-010.xht	544216b4b754c48bd39f163335c74ca642d05b48	?
-html4/numbers-units-011.htm	ec6b808f8e09eb797259c392b97f010d84fcb3e5	?
-xhtml1/numbers-units-011.xht	ec6b808f8e09eb797259c392b97f010d84fcb3e5	?
-html4/numbers-units-012.htm	17debc5471710d3a82f442d162e780ead7b8312a	?
-xhtml1/numbers-units-012.xht	17debc5471710d3a82f442d162e780ead7b8312a	?
-html4/numbers-units-013.htm	635cdfff1b2b432295ca89402ef6ce959c2aba8f	?
-xhtml1/numbers-units-013.xht	635cdfff1b2b432295ca89402ef6ce959c2aba8f	?
-html4/numbers-units-015.htm	2ba0616dabff5103226fc04ff804bb894ba4c7c0	?
-xhtml1/numbers-units-015.xht	2ba0616dabff5103226fc04ff804bb894ba4c7c0	?
+html4/numbers-units-006.htm	64c733740dc0c5e05af6a6592304ad3b55b5daca	?
+xhtml1/numbers-units-006.xht	64c733740dc0c5e05af6a6592304ad3b55b5daca	?
+html4/numbers-units-007.htm	3dfe4a5dae6eb7697fce00966df2834f4d87359c	?
+xhtml1/numbers-units-007.xht	3dfe4a5dae6eb7697fce00966df2834f4d87359c	?
+html4/numbers-units-009.htm	513eadb8bcc8563ffcc31990bcdb8f0750d1ee79	?
+xhtml1/numbers-units-009.xht	513eadb8bcc8563ffcc31990bcdb8f0750d1ee79	?
+html4/numbers-units-010.htm	1b0c3441b793346461c26bc4fdd3138e0eaf38d0	?
+xhtml1/numbers-units-010.xht	1b0c3441b793346461c26bc4fdd3138e0eaf38d0	?
+html4/numbers-units-011.htm	aa2ebfbe2bd7e9a7238771e4c9ce84c5f1b20655	?
+xhtml1/numbers-units-011.xht	aa2ebfbe2bd7e9a7238771e4c9ce84c5f1b20655	?
+html4/numbers-units-012.htm	2a34944648e55f05dd60e223acaf156c11ff87e5	?
+xhtml1/numbers-units-012.xht	2a34944648e55f05dd60e223acaf156c11ff87e5	?
+html4/numbers-units-013.htm	201dd865ba3719a067cd7e298b15be5bbfe500c2	?
+xhtml1/numbers-units-013.xht	201dd865ba3719a067cd7e298b15be5bbfe500c2	?
+html4/numbers-units-015.htm	cf44fc6d2f871deccf8b82446e048ce71328c531	?
+xhtml1/numbers-units-015.xht	cf44fc6d2f871deccf8b82446e048ce71328c531	?
 html4/numbers-units-016.htm	032197e595d43b318e71afaa18165c9b26897c6b	?
 xhtml1/numbers-units-016.xht	032197e595d43b318e71afaa18165c9b26897c6b	?
 html4/numbers-units-017.htm	9fd21f8ef2ef2fe2b6f9fc6027dd2fa08b2fcf82	?
 xhtml1/numbers-units-017.xht	9fd21f8ef2ef2fe2b6f9fc6027dd2fa08b2fcf82	?
-html4/numbers-units-018.htm	34b295f627cee5fca0f107cabe86f8fce947c5ca	?
-xhtml1/numbers-units-018.xht	34b295f627cee5fca0f107cabe86f8fce947c5ca	?
-html4/numbers-units-019.htm	2dcf21ffc8cc97573b4d991139da27f4f716983d	?
-xhtml1/numbers-units-019.xht	2dcf21ffc8cc97573b4d991139da27f4f716983d	?
-html4/numbers-units-021.htm	9e80c62cfd5aa67f5fe3c33a26b0512476ea8bdc	?
-xhtml1/numbers-units-021.xht	9e80c62cfd5aa67f5fe3c33a26b0512476ea8bdc	?
+html4/numbers-units-018.htm	be57984d07c22fde2d67254d12dc1ebfd64fda1b	?
+xhtml1/numbers-units-018.xht	be57984d07c22fde2d67254d12dc1ebfd64fda1b	?
+html4/numbers-units-019.htm	40d9cc6800e2f9fe3111f065d954088d3d2bb5a5	?
+xhtml1/numbers-units-019.xht	40d9cc6800e2f9fe3111f065d954088d3d2bb5a5	?
+html4/numbers-units-021.htm	a6149985d390df6ddf24490d296b9959cd4e0213	?
+xhtml1/numbers-units-021.xht	a6149985d390df6ddf24490d296b9959cd4e0213	?
 html4/orphans-001.htm	953c3caed0530e4dd244c8aa05a41bd4a701f1ea	?
 xhtml1/orphans-001.xht	953c3caed0530e4dd244c8aa05a41bd4a701f1ea	?
 html4/orphans-002.htm	0b30e80d7f2341ccb4aeb2fdaa3b00ba72e5a707	?
@@ -17278,8 +17280,6 @@ html4/positioning-float-001.htm	50264c490ae9409683f8a072e279099602f1c77c	?
 xhtml1/positioning-float-001.xht	50264c490ae9409683f8a072e279099602f1c77c	?
 html4/positioning-float-002.htm	42efe1fd42c36b2c1b349ef7f690f213a46cf241	?
 xhtml1/positioning-float-002.xht	42efe1fd42c36b2c1b349ef7f690f213a46cf241	?
-html4/positive-integer-001.htm	98dfaa21253c1d43cf700a11d1cc431e5ae1aaf0	?
-xhtml1/positive-integer-001.xht	98dfaa21253c1d43cf700a11d1cc431e5ae1aaf0	?
 html4/pseudo-001.htm	751666f6149112d7bad0551e021a8a00307f3b23	?
 xhtml1/pseudo-001.xht	751666f6149112d7bad0551e021a8a00307f3b23	?
 html4/pseudo-002.htm	a4039e47008a7a44973d8336a2aab28afe3968a6	?
@@ -17316,14 +17316,14 @@ html4/quoted-keywords-001.htm	a64d0840d126da498415b25ca1f5d5267d7f0a32	?
 xhtml1/quoted-keywords-001.xht	a64d0840d126da498415b25ca1f5d5267d7f0a32	?
 html4/quoted-keywords-002.htm	c414e10e62d7231538199d21b394d207014ea3ac	?
 xhtml1/quoted-keywords-002.xht	c414e10e62d7231538199d21b394d207014ea3ac	?
-html4/quoted-string-001.htm	107ee83ed431a8abb7dec80ffed6e71e3a3e5ca9	?
-xhtml1/quoted-string-001.xht	107ee83ed431a8abb7dec80ffed6e71e3a3e5ca9	?
-html4/quoted-string-002.htm	39f9bca485368a6611afaf3a75055158ab3f02b3	?
-xhtml1/quoted-string-002.xht	39f9bca485368a6611afaf3a75055158ab3f02b3	?
-html4/quoted-string-003.htm	1848569c68a274b7fa9c3da6bd3b0a30b29101da	?
-xhtml1/quoted-string-003.xht	1848569c68a274b7fa9c3da6bd3b0a30b29101da	?
-html4/quoted-string-004.htm	5ac33e5ee353283375ec1ff428e8ed5e658181de	?
-xhtml1/quoted-string-004.xht	5ac33e5ee353283375ec1ff428e8ed5e658181de	?
+html4/quoted-string-001.htm	b5c42f39f3eb1af9b2768ceb07e3865a2e52d27f	?
+xhtml1/quoted-string-001.xht	b5c42f39f3eb1af9b2768ceb07e3865a2e52d27f	?
+html4/quoted-string-002.htm	3a10759c246392c163407c9f7edbfb07401328f6	?
+xhtml1/quoted-string-002.xht	3a10759c246392c163407c9f7edbfb07401328f6	?
+html4/quoted-string-003.htm	9f364d0a9debe8977cfa710f8f0eeb373407e73b	?
+xhtml1/quoted-string-003.xht	9f364d0a9debe8977cfa710f8f0eeb373407e73b	?
+html4/quoted-string-004.htm	959fd29830d0b9d0166d6497122436e459b8f9b8	?
+xhtml1/quoted-string-004.xht	959fd29830d0b9d0166d6497122436e459b8f9b8	?
 html4/quotes-001.htm	6ef1fddce96455091b34a4499d60fd653e804b40	?
 xhtml1/quotes-001.xht	6ef1fddce96455091b34a4499d60fd653e804b40	?
 html4/quotes-002.htm	4304dcc38138e73b6ba581a7d9faa5aec04bcaa5	?
@@ -17916,12 +17916,13 @@ html4/run-in-text-between-004.htm	701b19a8dae2b4b661641d669c42e00883ad2e35	?
 xhtml1/run-in-text-between-004.xht	701b19a8dae2b4b661641d669c42e00883ad2e35	?
 html4/run-in-text-between-005.htm	d7fa420809bc09607ad23eae4224b6f81ed3cedc	?
 xhtml1/run-in-text-between-005.xht	d7fa420809bc09607ad23eae4224b6f81ed3cedc	?
+html4/select-cursor-001-manual.htm	a28f3026bed183a42b3255b9e8983a9b0addbdec	?
 html4/selectors-001.htm	393931454d1f9ee46fd5898f900540e73f46ba28	?
 xhtml1/selectors-001.xht	393931454d1f9ee46fd5898f900540e73f46ba28	?
 html4/selectors-002.htm	324e66b413fd52a8733366d16ab3cbe63efd7b17	?
 xhtml1/selectors-002.xht	324e66b413fd52a8733366d16ab3cbe63efd7b17	?
-html4/selectors-parsing-001.htm	8fee91da912f1f47ed82fcf74351c4a59b02a7f5	?
-xhtml1/selectors-parsing-001.xht	8fee91da912f1f47ed82fcf74351c4a59b02a7f5	?
+html4/selectors-parsing-001.htm	4730dd497040aee8a611c9bcbbff167414bb3646	?
+xhtml1/selectors-parsing-001.xht	4730dd497040aee8a611c9bcbbff167414bb3646	?
 html4/separated-border-model-001.htm	ab3fd30a5f7b961667fc7ae8931b6097c7a44d3c	?
 xhtml1/separated-border-model-001.xht	ab3fd30a5f7b961667fc7ae8931b6097c7a44d3c	?
 html4/separated-border-model-003.htm	888d164c8c95c999b21d857a61d2cef899a88d6d	?
@@ -17950,12 +17951,12 @@ html4/separated-border-model-008.htm	ecd2502a34347eacbeb76c3111ec7e3c6aa31b51	?
 xhtml1/separated-border-model-008.xht	ecd2502a34347eacbeb76c3111ec7e3c6aa31b51	?
 html4/separated-border-model-009.htm	ae0c6329ae2cf2a3847040d569d822d374cf7e39	?
 xhtml1/separated-border-model-009.xht	ae0c6329ae2cf2a3847040d569d822d374cf7e39	?
-html4/sgml-comments-000.htm	251176b218f63632477cee840de7b3f240745549	?
-xhtml1/sgml-comments-000.xht	251176b218f63632477cee840de7b3f240745549	?
+html4/sgml-comments-000.htm	a91d756f57d28c61ea4acc492541e0715521a75d	?
+xhtml1/sgml-comments-000.xht	a91d756f57d28c61ea4acc492541e0715521a75d	?
 html4/sgml-comments-001.htm	48a6f1c8501687b1fb041a5a4111302d51f24cdf	?
 xhtml1/sgml-comments-001.xht	48a6f1c8501687b1fb041a5a4111302d51f24cdf	?
-html4/sgml-comments-002.htm	019bdc428b4d41ff8c0568c0918761054efe4ead	?
-xhtml1/sgml-comments-002.xht	019bdc428b4d41ff8c0568c0918761054efe4ead	?
+html4/sgml-comments-002.htm	fbf88cdc37877fd2d23a30b742d44022b7712769	?
+xhtml1/sgml-comments-002.xht	fbf88cdc37877fd2d23a30b742d44022b7712769	?
 html4/shand-border-000.htm	1f1233e156bc1791deb976993808ec1cbcc5c554	?
 xhtml1/shand-border-000.xht	1f1233e156bc1791deb976993808ec1cbcc5c554	?
 html4/shand-border-001.htm	090681aa062e7927c73b3b7389072c821ff4a029	?
@@ -18012,8 +18013,8 @@ html4/stack-floats-004.htm	f9435d87cef472bda1be3c78a3fcd901f3906343	?
 xhtml1/stack-floats-004.xht	f9435d87cef472bda1be3c78a3fcd901f3906343	?
 html4/stack-overflow-001.htm	0ac2075313895de5408d667a6624eb9b684c0be8	?
 xhtml1/stack-overflow-001.xht	0ac2075313895de5408d667a6624eb9b684c0be8	?
-html4/strings-000.htm	fdd76901dc56841c1106381bc5618b0d4c6bf873	?
-xhtml1/strings-000.xht	fdd76901dc56841c1106381bc5618b0d4c6bf873	?
+html4/strings-000.htm	3f9070555ce98df41c88f8eb04f1d1deb1ea329f	?
+xhtml1/strings-000.xht	3f9070555ce98df41c88f8eb04f1d1deb1ea329f	?
 html4/style-attr-cascade-001.htm	9ea5fe841cee012c60f48a36f301ef4554767c4b	?
 xhtml1/style-attr-cascade-001.xht	9ea5fe841cee012c60f48a36f301ef4554767c4b	?
 html4/style-attr-cascade-002.htm	acbe2d01ac56c44e2fc6c7e7a8a4507ec8984f9a	?
@@ -19654,8 +19655,8 @@ html4/units-003.htm	ef5717eecdd4d8aa19c8b6ad49d9518e95ab2cc3	?
 xhtml1/units-003.xht	ef5717eecdd4d8aa19c8b6ad49d9518e95ab2cc3	?
 html4/units-004.htm	298881b918329c6e213ae3181a00016313542946	?
 xhtml1/units-004.xht	298881b918329c6e213ae3181a00016313542946	?
-html4/units-005.htm	0d5ad8f40a670300045f8f98efcab74b923996cd	?
-xhtml1/units-005.xht	0d5ad8f40a670300045f8f98efcab74b923996cd	?
+html4/units-005.htm	7740a320b02c33d69b30e6f61440f79fefd76c29	?
+xhtml1/units-005.xht	7740a320b02c33d69b30e6f61440f79fefd76c29	?
 html4/units-006.htm	5819af2a4624efaa28aec5fde72fef0f6fba0015	?
 xhtml1/units-006.xht	5819af2a4624efaa28aec5fde72fef0f6fba0015	?
 html4/units-008.htm	c0506c28ee0ee18f1de10bc47f78dc0d33406d92	?
@@ -19672,18 +19673,18 @@ 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/unterminated-string-001.htm	7b3d0ffc5eee37f59e4a784748cd8d9357cee5aa	?
-xhtml1/unterminated-string-001.xht	7b3d0ffc5eee37f59e4a784748cd8d9357cee5aa	?
+html4/unterminated-string-001.htm	0382eec4d581ec23a53d6eda52c957c826f5866e	?
+xhtml1/unterminated-string-001.xht	0382eec4d581ec23a53d6eda52c957c826f5866e	?
 html4/uri-001.htm	69b6499c2b5b5aea78312180be7647a2ea0c4253	?
 xhtml1/uri-001.xht	69b6499c2b5b5aea78312180be7647a2ea0c4253	?
 html4/uri-002.htm	b8f3777c50d2e318dc49c93c6e1ce0a39826ead1	?
 xhtml1/uri-002.xht	b8f3777c50d2e318dc49c93c6e1ce0a39826ead1	?
 html4/uri-003.htm	4a87a21092abcb735c658a83ee6e5877c73c0260	?
 xhtml1/uri-003.xht	4a87a21092abcb735c658a83ee6e5877c73c0260	?
-html4/uri-004.htm	b8193cd9c259089dacfdb5075eedf8dc0859bd5e	?
-xhtml1/uri-004.xht	b8193cd9c259089dacfdb5075eedf8dc0859bd5e	?
-html4/uri-005.htm	118d27c71bfff019b879c3400d9196a23d01e6aa	?
-xhtml1/uri-005.xht	118d27c71bfff019b879c3400d9196a23d01e6aa	?
+html4/uri-004.htm	f398813b293e8353317901a55009bb6e0fd5632b	?
+xhtml1/uri-004.xht	f398813b293e8353317901a55009bb6e0fd5632b	?
+html4/uri-005.htm	cf2dee1e554e78f8e3a318a49f59b5bf1d5215da	?
+xhtml1/uri-005.xht	cf2dee1e554e78f8e3a318a49f59b5bf1d5215da	?
 html4/uri-006.htm	e194a428f88ca8e8faa726ff5004dde06c8c0c12	?
 xhtml1/uri-006.xht	e194a428f88ca8e8faa726ff5004dde06c8c0c12	?
 html4/uri-007.htm	e7fab72cf0198ca4711275e874a24f848cfd86a8	?
@@ -19696,20 +19697,20 @@ html4/uri-010.htm	cb586834dbfbd00e398327a544a7805fd2ae7c1d	?
 xhtml1/uri-010.xht	cb586834dbfbd00e398327a544a7805fd2ae7c1d	?
 html4/uri-011.htm	8ee9e9b077a9a882a77d8e556215ad32592a0048	?
 xhtml1/uri-011.xht	8ee9e9b077a9a882a77d8e556215ad32592a0048	?
-html4/uri-012.htm	37b87b1dbcbb973d92496b6aa4d73cc0270b6a50	?
-xhtml1/uri-012.xht	37b87b1dbcbb973d92496b6aa4d73cc0270b6a50	?
+html4/uri-012.htm	e876f304de4636f8a5245dd1df1f0643945ab01d	?
+xhtml1/uri-012.xht	e876f304de4636f8a5245dd1df1f0643945ab01d	?
 html4/uri-013.htm	4ca482604467a6b27c9f2082796d9388d037a3c2	?
 xhtml1/uri-013.xht	4ca482604467a6b27c9f2082796d9388d037a3c2	?
-html4/uri-014.htm	a53eca3dcea35b4a3acc9eb1e24e06e27bbea4f5	?
-xhtml1/uri-014.xht	a53eca3dcea35b4a3acc9eb1e24e06e27bbea4f5	?
-html4/uri-015.htm	e79cf5f8475273a5fc775c9c18876647565d510f	?
-xhtml1/uri-015.xht	e79cf5f8475273a5fc775c9c18876647565d510f	?
-html4/uri-016.htm	f46f37c586a411e558f8093ff6ce31937c6af1f8	?
-xhtml1/uri-016.xht	f46f37c586a411e558f8093ff6ce31937c6af1f8	?
-html4/uri-017.htm	9f7991f7af09a8b98281ad2f3222db91fce56527	?
-xhtml1/uri-017.xht	9f7991f7af09a8b98281ad2f3222db91fce56527	?
-html4/uri-018.htm	f9fecbbd3b7644c0964697d4d7f6bcb3e2ccabca	?
-xhtml1/uri-018.xht	f9fecbbd3b7644c0964697d4d7f6bcb3e2ccabca	?
+html4/uri-014.htm	c944498e840590ecde933a0b4a090b7ceb9dafa1	?
+xhtml1/uri-014.xht	c944498e840590ecde933a0b4a090b7ceb9dafa1	?
+html4/uri-015.htm	8ba0157bc5cf38d1e2ab65282cf1d2997b5553d8	?
+xhtml1/uri-015.xht	8ba0157bc5cf38d1e2ab65282cf1d2997b5553d8	?
+html4/uri-016.htm	131fefc9a82309864af5baed0011d07ecd2a78e6	?
+xhtml1/uri-016.xht	131fefc9a82309864af5baed0011d07ecd2a78e6	?
+html4/uri-017.htm	6d19a196077d8c11349f2ba3d8dee2732946dcfc	?
+xhtml1/uri-017.xht	6d19a196077d8c11349f2ba3d8dee2732946dcfc	?
+html4/uri-018.htm	65b9bb7d3226d46e37132e8a941df28aa1446f4f	?
+xhtml1/uri-018.xht	65b9bb7d3226d46e37132e8a941df28aa1446f4f	?
 html4/user-stylesheet-001.htm	bdb684bf516242962072c5835fd586d701c703cd	?
 xhtml1/user-stylesheet-001.xht	bdb684bf516242962072c5835fd586d701c703cd	?
 html4/user-stylesheet-002.htm	0a679a59c7bf15c5fea14c55d03ee37d8764ffcb	?
@@ -19928,70 +19929,6 @@ html4/vertical-align-sub-001.htm	f6f78c9fe452d927dafd31fac65954862b72c202	?
 xhtml1/vertical-align-sub-001.xht	f6f78c9fe452d927dafd31fac65954862b72c202	?
 html4/vertical-align-super-001.htm	e99029cbeff79d345336ea9ddb33274302e13a5f	?
 xhtml1/vertical-align-super-001.xht	e99029cbeff79d345336ea9ddb33274302e13a5f	?
-html4/vertical-alignment-002a.htm	a55994c93e6652bdc61229154fe73727bd2c9aea	?
-xhtml1/vertical-alignment-002a.xht	a55994c93e6652bdc61229154fe73727bd2c9aea	?
-html4/vertical-alignment-002b.htm	779a3696b7909f11787ad979d92c965675b8ed71	?
-xhtml1/vertical-alignment-002b.xht	779a3696b7909f11787ad979d92c965675b8ed71	?
-html4/vertical-alignment-003a.htm	66706a353742efd4400d64575c633bb17a2a7252	?
-xhtml1/vertical-alignment-003a.xht	66706a353742efd4400d64575c633bb17a2a7252	?
-html4/vertical-alignment-003b.htm	c28364f9b1f41b8538e624119234b1d35d6c6091	?
-xhtml1/vertical-alignment-003b.xht	c28364f9b1f41b8538e624119234b1d35d6c6091	?
-html4/vertical-alignment-005a.htm	2df8dff5be7453c111fb9364ef9d796a91095b3a	?
-xhtml1/vertical-alignment-005a.xht	2df8dff5be7453c111fb9364ef9d796a91095b3a	?
-html4/vertical-alignment-005b.htm	2fc7c00892fc1d5860633a96bba4ba7878ad7004	?
-xhtml1/vertical-alignment-005b.xht	2fc7c00892fc1d5860633a96bba4ba7878ad7004	?
-html4/vertical-alignment-008a.htm	9dc8848f9db104ed33e3001e946369278588df9c	?
-xhtml1/vertical-alignment-008a.xht	9dc8848f9db104ed33e3001e946369278588df9c	?
-html4/vertical-alignment-008b.htm	7de9f0763dbb93b0f55dceb7b80116c87ad800df	?
-xhtml1/vertical-alignment-008b.xht	7de9f0763dbb93b0f55dceb7b80116c87ad800df	?
-html4/vertical-alignment-011a.htm	e3c5648ce732c30881a84fb5a0a8083191332a56	?
-xhtml1/vertical-alignment-011a.xht	e3c5648ce732c30881a84fb5a0a8083191332a56	?
-html4/vertical-alignment-011b.htm	724bbb86a2b9ec3bd9252fec92cacd6212775175	?
-xhtml1/vertical-alignment-011b.xht	724bbb86a2b9ec3bd9252fec92cacd6212775175	?
-html4/vertical-alignment-012l.htm	1684f5ad59fd0c5ce9f9d3190bf569388b3557ba	?
-xhtml1/vertical-alignment-012l.xht	1684f5ad59fd0c5ce9f9d3190bf569388b3557ba	?
-html4/vertical-alignment-012r.htm	dcd288dd395eea47285230ca20aa83dd6c874f17	?
-xhtml1/vertical-alignment-012r.xht	dcd288dd395eea47285230ca20aa83dd6c874f17	?
-html4/vertical-alignment-014a.htm	199a8e04915d4e564618ef120bf32e5c568cafc0	?
-xhtml1/vertical-alignment-014a.xht	199a8e04915d4e564618ef120bf32e5c568cafc0	?
-html4/vertical-alignment-014b.htm	755eb3f5800991c4d7df16dc70d2aaf30e419c42	?
-xhtml1/vertical-alignment-014b.xht	755eb3f5800991c4d7df16dc70d2aaf30e419c42	?
-html4/vertical-alignment-015a.htm	32b2362ace97e299f7beaa3aac8d3323837c7fc8	?
-xhtml1/vertical-alignment-015a.xht	32b2362ace97e299f7beaa3aac8d3323837c7fc8	?
-html4/vertical-alignment-015b.htm	f059163e577bcbadccf1e2912c2c8724777930c2	?
-xhtml1/vertical-alignment-015b.xht	f059163e577bcbadccf1e2912c2c8724777930c2	?
-html4/vertical-alignment-017a.htm	83b231bd5ad62e4e981f504bedbe7bfde444335d	?
-xhtml1/vertical-alignment-017a.xht	83b231bd5ad62e4e981f504bedbe7bfde444335d	?
-html4/vertical-alignment-017b.htm	20354412b9971eb45aafda4db62c290f6a2b1602	?
-xhtml1/vertical-alignment-017b.xht	20354412b9971eb45aafda4db62c290f6a2b1602	?
-html4/vertical-alignment-018a.htm	7cc30a291d2c69b03bd4179951b87c58e2a02ccb	?
-xhtml1/vertical-alignment-018a.xht	7cc30a291d2c69b03bd4179951b87c58e2a02ccb	?
-html4/vertical-alignment-018b.htm	bda9934745cc38f21bcb4235eac2d5824d849f9f	?
-xhtml1/vertical-alignment-018b.xht	bda9934745cc38f21bcb4235eac2d5824d849f9f	?
-html4/vertical-alignment-020a.htm	6533d451114b23d657e6bbc8362390a1c4aaf1eb	?
-xhtml1/vertical-alignment-020a.xht	6533d451114b23d657e6bbc8362390a1c4aaf1eb	?
-html4/vertical-alignment-020b.htm	7b7ff221754d9c3bc955380e044413ccfbf7ee8b	?
-xhtml1/vertical-alignment-020b.xht	7b7ff221754d9c3bc955380e044413ccfbf7ee8b	?
-html4/vertical-alignment-021a.htm	9ddfeee8aeba9e1241ce506ec75af1ba37f6ef06	?
-xhtml1/vertical-alignment-021a.xht	9ddfeee8aeba9e1241ce506ec75af1ba37f6ef06	?
-html4/vertical-alignment-021b.htm	0e68e5e6821c0645ff08d40eb02e7ddd87d99caf	?
-xhtml1/vertical-alignment-021b.xht	0e68e5e6821c0645ff08d40eb02e7ddd87d99caf	?
-html4/vertical-alignment-023a.htm	d42792f46d6c5d9052eaf7ed1c7981d3968fdc07	?
-xhtml1/vertical-alignment-023a.xht	d42792f46d6c5d9052eaf7ed1c7981d3968fdc07	?
-html4/vertical-alignment-023b.htm	a13b1e018382f0e99499b691e9cbbe8f2bcfb740	?
-xhtml1/vertical-alignment-023b.xht	a13b1e018382f0e99499b691e9cbbe8f2bcfb740	?
-html4/vertical-alignment-024a.htm	339511c5b7a5eef6400b44a7cb6403adebe16ae0	?
-xhtml1/vertical-alignment-024a.xht	339511c5b7a5eef6400b44a7cb6403adebe16ae0	?
-html4/vertical-alignment-024b.htm	d6cc4618d830dfb7a86b471d7b149546f7721bd4	?
-xhtml1/vertical-alignment-024b.xht	d6cc4618d830dfb7a86b471d7b149546f7721bd4	?
-html4/vertical-alignment-026a.htm	777a16060504fa5c1a2c649279ee6dbcb56729ad	?
-xhtml1/vertical-alignment-026a.xht	777a16060504fa5c1a2c649279ee6dbcb56729ad	?
-html4/vertical-alignment-026b.htm	fb3d8d2c8ec17a80bc05d9cf6027855dab6b9836	?
-xhtml1/vertical-alignment-026b.xht	fb3d8d2c8ec17a80bc05d9cf6027855dab6b9836	?
-html4/vertical-alignment-027a.htm	ca2c37b2acc7a2be0e438b5069acd2286487b6ab	?
-xhtml1/vertical-alignment-027a.xht	ca2c37b2acc7a2be0e438b5069acd2286487b6ab	?
-html4/vertical-alignment-027b.htm	eb3ef979b26f31507a2f72ba374274fd22113364	?
-xhtml1/vertical-alignment-027b.xht	eb3ef979b26f31507a2f72ba374274fd22113364	?
 html4/viewport-001.htm	ee2403cfe1c614848472858de2b9f8a9ce32a325	?
 xhtml1/viewport-001.xht	ee2403cfe1c614848472858de2b9f8a9ce32a325	?
 html4/viewport-002.htm	4165251e6f75e74e08615646f82d00f33cd66bfe	?
@@ -20282,10 +20219,10 @@ html4/white-space-processing-057.htm	76ca640feff22a7b851b1266465cad7f540e7d16	?
 xhtml1/white-space-processing-057.xht	76ca640feff22a7b851b1266465cad7f540e7d16	?
 html4/white-space-processing-058.htm	4063567cbd4849ab75cfcf1591fa09e39d7966b8	?
 xhtml1/white-space-processing-058.xht	4063567cbd4849ab75cfcf1591fa09e39d7966b8	?
-html4/whitespace-001.htm	aec9b731b1e112c54df3f7d3a7d42f2104fc5e2a	?
-xhtml1/whitespace-001.xht	aec9b731b1e112c54df3f7d3a7d42f2104fc5e2a	?
-html4/whitespace-002.htm	cda226c74c3e95eb9cc46444b272f394ad341a6a	?
-xhtml1/whitespace-002.xht	cda226c74c3e95eb9cc46444b272f394ad341a6a	?
+html4/whitespace-001.htm	a03d15e7e718a0197bc291f056770f02984370fc	?
+xhtml1/whitespace-001.xht	a03d15e7e718a0197bc291f056770f02984370fc	?
+html4/whitespace-002.htm	1e25d2450954c3a034e1bb6e209164ce626116cd	?
+xhtml1/whitespace-002.xht	1e25d2450954c3a034e1bb6e209164ce626116cd	?
 html4/widows-001.htm	a5a0a0b0d45560b3f5f85aab4351bb689957cfbd	?
 xhtml1/widows-001.xht	a5a0a0b0d45560b3f5f85aab4351bb689957cfbd	?
 html4/widows-002.htm	110cac2ac49d1e7e3b3af9e5f4120e7c93f27a89	?
diff --git a/tests/wpt/css-tests/css21_dev/testinfo.data b/tests/wpt/css-tests/css21_dev/testinfo.data
index 25bfc961929..86c9e453b27 100644
--- a/tests/wpt/css-tests/css21_dev/testinfo.data
+++ b/tests/wpt/css-tests/css21_dev/testinfo.data
@@ -480,32 +480,32 @@ anonymous-boxes-001b	reference/anonymous-boxes-001b-ref	Percent height inside an
 anonymous-boxes-inheritance-001	reference/anonymous-boxes-inheritance-001-ref	Anonymous box property inheritance	ahem	http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level	c14e3b5aff949c743707dbf7e126c413b8314887	`Microsoft`<http://www.microsoft.com/>	Anonymous boxes inherit property values from their non-anonymous box.
 anonymous-inline-whitespace-001	reference/ref-if-there-is-no-red	White space does not generate an anonymous inline box		http://www.w3.org/TR/CSS21/visuren.html#anonymous	7fe25707146e900febf8b549fc3588da7be6b1ae	`Microsoft`<http://www.microsoft.com/>	White space is collapsed according to the 'white-space' property and does not generate an anonymous inline box.
 anonymous-table-box-width-001	reference/ref-filled-green-100px-square	Width of anonymous table box versus caption box in the automatic table layout		http://www.w3.org/TR/CSS21/tables.html#auto-table-layout	43447b070391816bdb697e1b3d2b485013c14a08	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Anonymous table box should be as wide as max(table-width, table-caption-min-intrinsic-width).
-at-charset-001		HTTP Charset vs BOM	http	http://www.w3.org/TR/CSS21/syndata.html#charset	4bf6f48a7e193f16d711ddc6bb4715793fc8ced2	`Microsoft`<http://www.microsoft.com/>	The Byte Order Mark in the stylesheet overrides the HTTP charset setting.
-at-charset-002		HTTP Charset over @charset	http	http://www.w3.org/TR/CSS21/syndata.html#charset	2c0f52ac45b5abfbcf011fecb01e87a9d90a3774	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the @charset designation in the stylesheet.
-at-charset-003		HTTP charset over link charset	http	http://www.w3.org/TR/CSS21/syndata.html#charset	b9fc7ffdd31c1f7c1a285e374987327d993450bf	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the charset designation in the link tag.
-at-charset-004		HTTP charset over set referring code page (UTF-8)	http	http://www.w3.org/TR/CSS21/syndata.html#charset	3d8334e5c8d7da941ddd2c6fc30aae870301e902	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the referring document's code page.
-at-charset-005		HTTP charset over set referring code page (windows-1252)	http	http://www.w3.org/TR/CSS21/syndata.html#charset	607e2d745abbecd99158a8b8bec64df8b7abd294	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the charset designation in the referring document's meta tag.
-at-charset-006		HTTP charset over referring code page (not set)	http	http://www.w3.org/TR/CSS21/syndata.html#charset	ba407373c3ced5994252ff94916e2c5d5cea5427	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the charset of referring document.
-at-charset-007		@charset over link charset attribute		http://www.w3.org/TR/CSS21/syndata.html#charset	4016605b2e0ca67dbb752c5d31943ed67c65d944	`Microsoft`<http://www.microsoft.com/>	The @charset setting in the stylesheet overrides the charset attribute of the link element.
-at-charset-008		@charset over referring document's code page (set)		http://www.w3.org/TR/CSS21/syndata.html#charset	0de2426e92018d1354227c0daf8cfa0e18d47a21	`Microsoft`<http://www.microsoft.com/>	The @charset setting in the stylesheet overrides the referring document's set code page.
-at-charset-009		@charset over referring document's code page (unset)		http://www.w3.org/TR/CSS21/syndata.html#charset	dca97c9cff496623b15e84fbaa6eda46fa5a2ed4	`Microsoft`<http://www.microsoft.com/>	The @charset setting in the stylesheet overrides the referring document's unset code page.
-at-charset-010		Link charset attribute over referring document's codepage (set)		http://www.w3.org/TR/CSS21/syndata.html#charset	672e65e1d9a01be75563d84ddd9b2f6366687e01	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page.
-at-charset-011		Link charset attribute over referring document's codepage (not set)		http://www.w3.org/TR/CSS21/syndata.html#charset	b89b7e2e15e09db49ad4beb25eb5d30ec8935088	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page.
-at-charset-012		Stylesheet encoding via the referring document's encoding (set)		http://www.w3.org/TR/CSS21/syndata.html#charset	b5eb6c03901e3076df56581e798029b3b7e831ad	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the set encoding of the referring document.
+at-charset-001	reference/at-charset-001-ref	HTTP Charset vs BOM	http	http://www.w3.org/TR/CSS21/syndata.html#charset	93897b73f6608b76f4a5019b6332498d66819dac	`Microsoft`<http://www.microsoft.com/>	The Byte Order Mark in the stylesheet overrides the HTTP charset setting.
+at-charset-002	at-charset-001,reference/at-charset-001-ref	HTTP Charset over @charset	http	http://www.w3.org/TR/CSS21/syndata.html#charset	3321d569645976e4ad31ad7d8ae56beec83fc93a	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the @charset designation in the stylesheet.
+at-charset-003	at-charset-001,reference/at-charset-001-ref	HTTP charset over link charset	http	http://www.w3.org/TR/CSS21/syndata.html#charset	c9d5df0b136416557c7fdb6f4bcf5dc985b00ce1	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the charset designation in the link tag.
+at-charset-004	at-charset-001,reference/at-charset-001-ref	HTTP charset over set referring code page (UTF-8)	http	http://www.w3.org/TR/CSS21/syndata.html#charset	3f11f93fb92e27a22b5c015bc47babd445609651	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the referring document's code page.
+at-charset-005	at-charset-001,reference/at-charset-001-ref	HTTP charset over set referring code page (windows-1252)	http	http://www.w3.org/TR/CSS21/syndata.html#charset	87668d0a4ffb30a0a88a4ead0693a426c00037a3	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the charset designation in the referring document's meta tag.
+at-charset-006	at-charset-001,reference/at-charset-001-ref	HTTP charset over referring code page (not set)	http	http://www.w3.org/TR/CSS21/syndata.html#charset	f22ace8a452f783ecebba8ccf6646a548665ef05	`Microsoft`<http://www.microsoft.com/>	The HTTP charset setting overrides the charset of referring document.
+at-charset-007	at-charset-001,reference/at-charset-001-ref	@charset over link charset attribute		http://www.w3.org/TR/CSS21/syndata.html#charset	f0a613cab842dcb89e298cf1d33b2374b11b4da4	`Microsoft`<http://www.microsoft.com/>	The @charset setting in the stylesheet overrides the charset attribute of the link element.
+at-charset-008	at-charset-001,reference/at-charset-001-ref	@charset over referring document's code page (set)		http://www.w3.org/TR/CSS21/syndata.html#charset	f35f30557db816f2f2490f3a79bf6b65d04b5401	`Microsoft`<http://www.microsoft.com/>	The @charset setting in the stylesheet overrides the referring document's set code page.
+at-charset-009	at-charset-001,reference/at-charset-001-ref	@charset over referring document's code page (unset)		http://www.w3.org/TR/CSS21/syndata.html#charset	793c282531b63bbbe7abfc3a98055359d573e2cd	`Microsoft`<http://www.microsoft.com/>	The @charset setting in the stylesheet overrides the referring document's unset code page.
+at-charset-010	at-charset-001,reference/at-charset-001-ref	Link charset attribute over referring document's codepage (set)		http://www.w3.org/TR/CSS21/syndata.html#charset	cbc1ff89a28459d6a5315580df00c55a1bd28c0f	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page.
+at-charset-011	at-charset-001,reference/at-charset-001-ref	Link charset attribute over referring document's codepage (not set)		http://www.w3.org/TR/CSS21/syndata.html#charset	92eb5671531e588e905b89f9a640d91c0738e8fd	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page.
+at-charset-012	at-charset-001,reference/at-charset-001-ref	Stylesheet encoding via the referring document's encoding (set)		http://www.w3.org/TR/CSS21/syndata.html#charset	35df77f52ef1aa8216c07921a4d611f59e6aa7ea	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the set encoding of the referring document.
 at-charset-013		Stylesheet encoding via the referring document's encoding (user set)	HTMLonly,interact	http://www.w3.org/TR/CSS21/syndata.html#charset	145d211ea37c74e5394d6b6f93328fe536f21a1d	`Microsoft`<http://www.microsoft.com/>	The stylesheet's encoding is determined by the user set referring document's encoding.
-at-charset-014		Matching BOM and @charset (utf-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	d5ea66e93b7fd447d5214e0fefa1e64998e2a5fe	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
-at-charset-015		Matching BOM and @charset (utf-16 LE)		http://www.w3.org/TR/CSS21/syndata.html#charset	0e8a58ff89b32cef8f641c6566e8ad24f3e501e6	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
-at-charset-016		Matching BOM and @charset (utf-16 BE)		http://www.w3.org/TR/CSS21/syndata.html#charset	57df924a54426a8651d2ebef45ab60c9db966793	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
-at-charset-019		BOM with no @charset (utf-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	4cd7ea47c955aabb9a2e3cf2438132eb6e01deac	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as utf-8.
-at-charset-020		BOM with no @charset (utf-16LE)		http://www.w3.org/TR/CSS21/syndata.html#charset	fac7572ec79805a617c05a3266d9a745723365e4	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as utf-16LE.
-at-charset-021		BOM with no @charset (utf-16BE)		http://www.w3.org/TR/CSS21/syndata.html#charset	02602dfdbaf2b2a7b6a3b97214cc969e6b1574c1	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as utf-16BE.
-at-charset-024		@charset specified (windows-1252)		http://www.w3.org/TR/CSS21/syndata.html#charset	2c92f2774b62bbdd091a6730469e0310253eb44b	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as windows-1252.
-at-charset-025		@charset specified (Shift-JIS)		http://www.w3.org/TR/CSS21/syndata.html#charset	fe6fba7d17634715d6e12c7103ba9868f88c39c9	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as Shift-JIS.
-at-charset-026		@charset specified (ISO-8859-6)		http://www.w3.org/TR/CSS21/syndata.html#charset	27bf4ccd80875414653b26ea51e01b66250a013a	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as ISO-8859-6.
-at-charset-027		@charset specified (Big5)		http://www.w3.org/TR/CSS21/syndata.html#charset	248ed657ce11b5072c5e5d07d7c65b8872fe05dd	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as Big5.
-at-charset-028		@charset specified (UTF-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	aaa9e201e3f30cf88a01e6f037436f28fd57ee09	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as UTF-8.
-at-charset-029		@charset specified (UTF-16LE)		http://www.w3.org/TR/CSS21/syndata.html#charset	d6a48c0416a49e8c29d2180faf72c581aa709494	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF-16LE.
-at-charset-030		@charset specified (UTF-16BE)		http://www.w3.org/TR/CSS21/syndata.html#charset	9e96f5e5537f454307477203131f96813ea5acb6	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF-16BE.
+at-charset-014	at-charset-001,reference/at-charset-001-ref	Matching BOM and @charset (utf-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	035ea1d49efaf9456f5a528626324c6163475825	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
+at-charset-015	at-charset-001,reference/at-charset-001-ref	Matching BOM and @charset (utf-16 LE)		http://www.w3.org/TR/CSS21/syndata.html#charset	f98f9c1fcfbc6cc3bda50c37fe3c9c109fc0569f	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
+at-charset-016	at-charset-001,reference/at-charset-001-ref	Matching BOM and @charset (utf-16 BE)		http://www.w3.org/TR/CSS21/syndata.html#charset	13c2949e046242c3c29d2d941af4fc0edc3d995b	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
+at-charset-019	at-charset-001,reference/at-charset-001-ref	BOM with no @charset (utf-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	1940dd08083bbe9e827cd9b882684a31eb60c451	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as utf-8.
+at-charset-020	at-charset-001,reference/at-charset-001-ref	BOM with no @charset (utf-16LE)		http://www.w3.org/TR/CSS21/syndata.html#charset	53ec3c6f2204bda5ee840a7a7534996259c7c735	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as utf-16LE.
+at-charset-021	at-charset-001,reference/at-charset-001-ref	BOM with no @charset (utf-16BE)		http://www.w3.org/TR/CSS21/syndata.html#charset	399a1bc5223fb311b520d7f6d9a6517df9a06c18	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as utf-16BE.
+at-charset-024	at-charset-001,reference/at-charset-001-ref	@charset specified (windows-1252)		http://www.w3.org/TR/CSS21/syndata.html#charset	49c45cb0046ce1dc2870eeff339aee2b6f7f53bc	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as windows-1252.
+at-charset-025	at-charset-001,reference/at-charset-001-ref	@charset specified (Shift-JIS)		http://www.w3.org/TR/CSS21/syndata.html#charset	b0197ed8e4f296aaf2601bedbfc8fb6b9728be8f	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as Shift-JIS.
+at-charset-026	at-charset-001,reference/at-charset-001-ref	@charset specified (ISO-8859-6)		http://www.w3.org/TR/CSS21/syndata.html#charset	411e99161f309c366d5f9ee2673f001d67b64df9	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as ISO-8859-6.
+at-charset-027	at-charset-001,reference/at-charset-001-ref	@charset specified (Big5)		http://www.w3.org/TR/CSS21/syndata.html#charset	e61001f9bb837600ecb36acbc54edfcbb148849d	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as Big5.
+at-charset-028	at-charset-001,reference/at-charset-001-ref	@charset specified (UTF-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	2a247ce833f7b9a1afdc54080e798855185f601b	`Microsoft`<http://www.microsoft.com/>	The stylesheet is correctly interpreted as UTF-8.
+at-charset-029	at-charset-001,reference/at-charset-001-ref	@charset specified (UTF-16LE)		http://www.w3.org/TR/CSS21/syndata.html#charset	68df5956df90e3212228eb631eb257b2d19e16d0	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF-16LE.
+at-charset-030	at-charset-001,reference/at-charset-001-ref	@charset specified (UTF-16BE)		http://www.w3.org/TR/CSS21/syndata.html#charset	12123d3781b19919233ed7440bb876e36a03fe85	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF-16BE.
 at-charset-033	reference/filler-text-below-green	Non-matching BOM (windows-1252 with UTF-8 BOM)		http://www.w3.org/TR/CSS21/syndata.html#charset	1790635b5d1aab50bd3813477e051295dd7345e9	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the BOM not matching the actual encoding.
 at-charset-034	reference/filler-text-below-green	Non-matching BOM (UTF-8 with UTF-16LE BOM)		http://www.w3.org/TR/CSS21/syndata.html#charset	4a24ece550e2ea3ed62a9c9f7b51fd6f9dd00d41	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the BOM not matching the actual encoding.
 at-charset-035	reference/filler-text-below-green	Non-matching BOM (UTF-16LE with UTF-8 BOM)		http://www.w3.org/TR/CSS21/syndata.html#charset	af1d691a070390a88836c7d29c98e356d9cc6678	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the BOM not matching the actual encoding.
@@ -513,35 +513,35 @@ at-charset-036	reference/filler-text-below-green	Non-matching BOM (UTF-32BE with
 at-charset-037	reference/filler-text-below-green	Non-matching @charset (Shift-JIS with 1252 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	16ccc2234cc158e56cf0dc86c3b1953d8ad7e2bf	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the mismatched @charset.
 at-charset-038	reference/filler-text-below-green	Non-matching @charset (Big5 with Shift-JIS @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	fbd982159e360eaaebfe4044f04cedcabbb86e2e	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the mismatched @charset.
 at-charset-039		Matching BOM and @charset (utf-8)		http://www.w3.org/TR/CSS21/syndata.html#charset	4fa92eaadf698020ec2eb7d1f5fd1ba4ae1d7c95	`Microsoft`<http://www.microsoft.com/>	The encoding is correctly interpreted from the matched BOM and @charset.
-at-charset-040		Non-matching @charset (UTF-16BE with UTF-8 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	5e67c620f8e19b9fc8b8e4cfefcff0ddbc5321cb	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the mismatched @charset.
-at-charset-041		Non-matching @charset (UTF-32LE with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	66b8820875ee8b031c9fcf97cd4df58cba0b28c7	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the mismatched @charset.
-at-charset-042		@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	a9d4dc69e1463a1290fab4003a232746f6035430	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-8.
-at-charset-043		@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	79fe44529bba816a163aea4b531190c9e889835a	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-8.
-at-charset-044		@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	90605b2fdf5603a31c4407155594343cfb8e8435	`Microsoft`<http://www.microsoft.com/>	UTF-32 is not supported.
-at-charset-045		Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	c72b5464da0a3546dd9c1efbfb47209f3250e51e	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-16LE.
-at-charset-046		Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	f7415f7b55c2fd43ccb3bfe1f9d2b96e54f21d99	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF16BE.
-at-charset-047		Endianness not specified (UTF-16LE encoding with UTF-16 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	1f849cf79cf1d1c66aff8586e836a4d9ffc4040b	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF-16LE.
-at-charset-048		Endianness not specified (UTF-16BE encoding with UTF-16 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	e787a6663b3297ab6ee7e77f2a74e384e4c950c8	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF16-BE.
+at-charset-040	at-charset-001,reference/at-charset-001-ref	Non-matching @charset (UTF-16BE with UTF-8 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	3e309d309100e9763e52b3a485ad128671d35ad0	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the mismatched @charset.
+at-charset-041	at-charset-001,reference/at-charset-001-ref	Non-matching @charset (UTF-32LE with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	730447b9716a636835e8ae8e90d2f2e62eeda22a	`Microsoft`<http://www.microsoft.com/>	The stylesheet is thrown out due to the mismatched @charset.
+at-charset-042	at-charset-001,reference/at-charset-001-ref	@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	5227cfd6e5b85366a9f47f08996d444c3f79ee93	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-8.
+at-charset-043	at-charset-001,reference/at-charset-001-ref	@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	c3275c3711f9addbb053b045c3259607fce551c4	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-8.
+at-charset-044	at-charset-001,reference/at-charset-001-ref	@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	76f9d0fa15c413fce1a8be7f0939d5a6e9b06172	`Microsoft`<http://www.microsoft.com/>	UTF-32 is not supported.
+at-charset-045	at-charset-001,reference/at-charset-001-ref	Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	aabf85f377f2aae34dd98c3754c5f5b4af6b22fc	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-16LE.
+at-charset-046	at-charset-001,reference/at-charset-001-ref	Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	36409371ee6e5cf9934440d70a0e6db064e4a1fb	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF16BE.
+at-charset-047	at-charset-001,reference/at-charset-001-ref	Endianness not specified (UTF-16LE encoding with UTF-16 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	9573d78d758ae285aee8f2df196e31ff820e5968	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF-16LE.
+at-charset-048	at-charset-001,reference/at-charset-001-ref	Endianness not specified (UTF-16BE encoding with UTF-16 @charset)		http://www.w3.org/TR/CSS21/syndata.html#charset	80e125ff50d402e39517d0110aaa77bdb2aa3c88	`Microsoft`<http://www.microsoft.com/>	The stylesheet is not interpreted as UTF16-BE.
 at-charset-049	reference/filler-text-below-green	@charset preceded by a newline		http://www.w3.org/TR/CSS21/syndata.html#charset	f9414cc7378cfc6690d1a7afbab0e4bf260f8862	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-050	reference/filler-text-below-green	@charset preceded by a space		http://www.w3.org/TR/CSS21/syndata.html#charset	304a693abd605ca4ebf6d8ba51d12d0d52ef75fe	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-051	reference/filler-text-below-green	@charset preceded by a declaration		http://www.w3.org/TR/CSS21/syndata.html#charset	e2157d728e600969cb37da09401990e7773002e0	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-052	reference/filler-text-below-green	@charset preceded by another @charset		http://www.w3.org/TR/CSS21/syndata.html#charset	be3b5dde981c44a2e6e31f5d1d105762f71eda11	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the second @charset being ignored.
 at-charset-053	reference/filler-text-below-green	@charset immediately followed by a declaration block		http://www.w3.org/TR/CSS21/syndata.html#charset	a499e9fc5ef9abaf9e3045580c134376891e5880	`Microsoft`<http://www.microsoft.com/>	The declaration block is interpreted and applied correctly.
-at-charset-054		@charset in uppercase		http://www.w3.org/TR/CSS21/syndata.html#charset	a83e808cbbd903bb7afe894a18f635107bcad9e5	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
+at-charset-054	reference/filler-text-below-green	@charset in uppercase		http://www.w3.org/TR/CSS21/syndata.html#charset	5521d5bc7c93989c690170e916c94306b9f2d537	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-055	reference/filler-text-below-green	@charset without quotes		http://www.w3.org/TR/CSS21/syndata.html#charset	27c13c2eb8858106158ce59426bb946a8b9ec191	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
-at-charset-056		@charset missing a space		http://www.w3.org/TR/CSS21/syndata.html#charset	517e3f56227ebbcc51b5b1cc7a428e673079fb68	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
+at-charset-056	reference/filler-text-below-green	@charset missing a space		http://www.w3.org/TR/CSS21/syndata.html#charset	87ea5fb7190a9e4a37354618158ca7e0c73c997f	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-057	reference/filler-text-below-green	@charset escaped numerically		http://www.w3.org/TR/CSS21/syndata.html#charset	efcaaa9c444c37f7fcd81a14757571fafe7b4edc	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-058	reference/filler-text-below-green	@charset escaped char		http://www.w3.org/TR/CSS21/syndata.html#charset	a844563ef04870f0e44cf81d2943e9330d5970f1	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
 at-charset-059	reference/filler-text-below-green	@charset missing semi-colon		http://www.w3.org/TR/CSS21/syndata.html#charset	e3e11a52963a303acdef4a0709ab83197901a026	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
-at-charset-060		@charset with bogus name		http://www.w3.org/TR/CSS21/syndata.html#charset	14d3ff75bda3e1623dcc7e331167d23b60d846b9	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-16LE based on BOM.
-at-charset-061		@charset within style block		http://www.w3.org/TR/CSS21/syndata.html#charset	6abee0aa6960d9a115e8bccc55e2c61f6a4fa407	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
-at-charset-071		Stylesheet encodings: ISO-8859-1	http	http://www.w3.org/TR/CSS21/syndata.html#charset	8d34718670f2584d69fe620393ae9e60f0d0bc37	`Ian Hickson`<mailto:ian@hixie.ch>	
-at-charset-072		Stylesheet encodings: ISO-8859-11	http	http://www.w3.org/TR/CSS21/syndata.html#charset	a7b8d3afe25b36b982e2a6f9b196b94320eb76bb	`Ian Hickson`<mailto:ian@hixie.ch>	
-at-charset-073		Stylesheet encodings: ISO-8859-5	http	http://www.w3.org/TR/CSS21/syndata.html#charset	289ef644ec3bf0132eed7b3f6afa552722afbf80	`Ian Hickson`<mailto:ian@hixie.ch>	
-at-charset-074		Stylesheet encodings: ISO-8859-6	http	http://www.w3.org/TR/CSS21/syndata.html#charset	39d34bf2bd1a548f6df57d9a5c11d6de9d08c643	`Ian Hickson`<mailto:ian@hixie.ch>	
-at-charset-075		Stylesheet encodings: ISO-8859-7	http	http://www.w3.org/TR/CSS21/syndata.html#charset	b4c3bb5aa7bedab2251e7ca17efa80d05ac2f7a0	`Ian Hickson`<mailto:ian@hixie.ch>	
-at-charset-076		Stylesheet encodings: ISO-8859-8	http	http://www.w3.org/TR/CSS21/syndata.html#charset	6fcb5909b0055257d8c77e3a056e989ff360dd2c	`Ian Hickson`<mailto:ian@hixie.ch>	
-at-charset-077		Stylesheet encodings: KOI8-R	http	http://www.w3.org/TR/CSS21/syndata.html#charset	8d7cc8b4c7fb8cf68f3e923572a79c2644e7fadb	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-060	at-charset-001,reference/at-charset-001-ref	@charset with bogus name		http://www.w3.org/TR/CSS21/syndata.html#charset	e2dda79c915d699ddc74b43b7b10e4b6e227d207	`Microsoft`<http://www.microsoft.com/>	The stylesheet is interpreted as UTF-16LE based on BOM.
+at-charset-061	reference/filler-text-below-green	@charset within style block		http://www.w3.org/TR/CSS21/syndata.html#charset	0338e94efe2e1ee58ac138b484b80caf58952bff	`Microsoft`<http://www.microsoft.com/>	The selector does not match due to the @charset being ignored.
+at-charset-071	reference/ref-green-background	Stylesheet encodings: ISO-8859-1	http	http://www.w3.org/TR/CSS21/syndata.html#charset	5b2e3469f7bada574545a686ca1642b3baf130f2	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-072	reference/ref-green-background	Stylesheet encodings: ISO-8859-11	http	http://www.w3.org/TR/CSS21/syndata.html#charset	c712f6afe4d73b46f4f59634e0a4442147d5d1c7	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-073	reference/ref-green-background	Stylesheet encodings: ISO-8859-5	http	http://www.w3.org/TR/CSS21/syndata.html#charset	b6251d74bc0b88c424280d9cfa461a6f832c7b22	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-074	reference/ref-green-background	Stylesheet encodings: ISO-8859-6	http	http://www.w3.org/TR/CSS21/syndata.html#charset	4525247b089c813170ef851a59504de7a5959e43	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-075	reference/ref-green-background	Stylesheet encodings: ISO-8859-7	http	http://www.w3.org/TR/CSS21/syndata.html#charset	33196f7ef95f715e5ba17566e60069b2280c56ea	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-076	reference/ref-green-background	Stylesheet encodings: ISO-8859-8	http	http://www.w3.org/TR/CSS21/syndata.html#charset	0e923135d4b77a2bc1bb624081ed7be31a9d791c	`Ian Hickson`<mailto:ian@hixie.ch>	
+at-charset-077	reference/ref-green-background	Stylesheet encodings: KOI8-R	http	http://www.w3.org/TR/CSS21/syndata.html#charset	8cd18dfeb310d1ac39efa7ac1362b3f317011d9b	`Ian Hickson`<mailto:ian@hixie.ch>	
 at-charset-quotes-001	reference/at-charset-ref	@charset quotes		http://www.w3.org/TR/CSS21/syndata.html#charset	d2a6bcd603dfa2cd437e1470c9c187efe2759f7c	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>,`Mozilla Corporation`<http://mozilla.com/>	
 at-charset-space-001	reference/at-charset-ref	@charset leading-space		http://www.w3.org/TR/CSS21/syndata.html#charset	205c0029324ad9443dbe5f24a8e60ba67929e6ce	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>,`Mozilla Corporation`<http://mozilla.com/>	
 at-charset-space-002	reference/at-charset-ref	@charset trailing-space		http://www.w3.org/TR/CSS21/syndata.html#charset	c4dc14c27e719d3f70e36335cad190ae5f939b1c	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>,`Mozilla Corporation`<http://mozilla.com/>	
@@ -559,12 +559,12 @@ at-import-005	reference/filler-text-below-green	Media dependency on @import set
 at-import-006	reference/filler-text-below-green	Media dependency on @import set to 'screen'		http://www.w3.org/TR/CSS21/cascade.html	92a3f34c455e12ebd60bc598a64ed93d956c786e	`Microsoft`<http://www.microsoft.com/>	Specifying the media-dependent import rules to 'screen' applies to user agent display.
 at-import-007	reference/filler-text-below-green	@import with @charset		http://www.w3.org/TR/CSS21/cascade.html	cff5ad9c4b5626535a4e28600b5c14a8a585edf4	`Microsoft`<http://www.microsoft.com/>	An @import is valid after @charset.
 at-import-008		@import - media-dependence	paged	http://www.w3.org/TR/CSS21/cascade.html#at-import	9bcf440f20110a66791d0b3bcd4bc00a6eae5756	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Media-dependent @import rules
-at-import-009		@import following a known but invalid @rule	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	e5b371c428e39fcd01cc210d14ae42d75c979874	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	@import is respected after known but ignored @rule.
-at-import-010		@import following an invalid selector	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	3476b51cad2b67fe1ebc65f740baeb4b1a58ac4e	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	@import is respected after invalid (ignored) rule set
-at-import-011		@import following garbage	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	d1f428ce5248d4730cef02125a4e4273a8dcf341	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	@import is parsed as part of invalid ruleset after garbage.
-at-keywords-000		At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	5eda5f94a2ee1eeef4f77493b4416c06806bfcf2	`L. David Baron`<http://dbaron.org/>	
-at-keywords-001		At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	e7dc5faae9094132f6b569a384c82a4228475a94	`L. David Baron`<http://dbaron.org/>	
-at-keywords-002		At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	0580cb5283ec9a7d9a8c8acbefd83d277ac4c37b	`L. David Baron`<http://dbaron.org/>	
+at-import-009	reference/ref-this-text-should-be-green	@import following a known but invalid @rule	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	16c04492dd403e817be2978a5bdc457bcf756e31	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	@import is respected after known but ignored @rule.
+at-import-010	reference/ref-this-text-should-be-green	@import following an invalid selector	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	c505b28c402da59ad76c8614c09089d105996433	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	@import is respected after invalid (ignored) rule set
+at-import-011	reference/ref-this-text-should-be-green	@import following garbage	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	4a459a88cd479ff57127ae9de02a02eb0b29e0b7	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	@import is parsed as part of invalid ruleset after garbage.
+at-keywords-000	reference/ref-this-text-should-be-green	At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	6a69d35f45a0c4c8a3f6eb14236e6892bf3286ec	`L. David Baron`<http://dbaron.org/>	
+at-keywords-001	reference/ref-this-text-should-be-green	At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	06bf0a07bc5f7c5e88fc7926225355dcdf508d47	`L. David Baron`<http://dbaron.org/>	
+at-keywords-002	reference/ref-this-text-should-be-green	At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	84cd55a42d760ac64dbe2c37e9659b33322de5cc	`L. David Baron`<http://dbaron.org/>	
 at-page-rule-001		Ignoring at-rules inside declaration blocks	invalid,paged	http://www.w3.org/TR/CSS21/page.html#page-box	465e1ba919d503e73e78ce261f350bcba2be8a42	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	At-rules inside @page blocks are parsed as invalid at-rule statements.
 at-page-rule-002-a		@page margins on top and right using percentages	paged	http://www.w3.org/TR/CSS21/page.html#page-margins,http://www.w3.org/TR/css3-page/#page-properties,http://www.w3.org/TR/css3-page/#page-box-page-rule	289e15dd0ad1b2e798302b4a25f28260f167d2e7	`Tom Clancy`<mailto:tclancy@revenution.com>	A percentage right margin in the @page context applies to the page box and is relative to the width of the page box. A percentage top margin in the @page context applies to the page box and is relative to the height of the page box.
 at-page-rule-002-b		@page margins shorthand using fixed physical units	paged	http://www.w3.org/TR/CSS21/page.html#page-margins,http://www.w3.org/TR/css3-page/#page-properties,http://www.w3.org/TR/css3-page/#page-box-page-rule	8563c04d9a46f9b8baf5e16fa5ecbcd44ec56fdb	`Tom Clancy`<mailto:tclancy@revenution.com>	A margin declaration within the @page context applies to the page box.
@@ -581,12 +581,12 @@ at-rule-009	reference/filler-text-below-green	@import after a bad selector and r
 at-rule-010	reference/filler-text-below-green	@rules and white space		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	1f46935feaef712087ff0b9ba2c0a8545c940897	`Microsoft`<http://www.microsoft.com/>	White space does not affect the validity of @rules.
 at-rule-011	reference/filler-text-below-green	Parser error handling with invalid at-rules: @ invalid selector with a number	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	ab913d2ccd90e19455dd9cf1b17fe094526a783e	`Microsoft`<http://www.microsoft.com/>	At-Rules are ignored if they start with an at-keyword (@ followed immediately by an identifier).
 at-rule-012	reference/filler-text-below-green	Parser error handling with invalid at-rules: @ invalid selector with a hyphen	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	5b585b175c7d36257534d636f2f5b477fe902c08	`Microsoft`<http://www.microsoft.com/>	At-Rules are ignored it they start with an at-keyword (@ followed immediately by an identifier).
-at-rule-013		Ignoring at-rules inside @media blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	083b2615b3c7341449003ddb25e16568469b41f1	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	At-rules inside @media blocks are ignored up to up to the end of the block that contains the invalid at-keyword, or up to and including the next semicolon (;) or up to and including the next block ({...}), whichever comes first.
-at-rules-000		At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	388e50ee967950d94b95d276821640c176205f98	`L. David Baron`<http://dbaron.org/>	
-at-rules-001		At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	341edab45d3db82aed036da1c86b203571ebffb6	`L. David Baron`<http://dbaron.org/>	
-at-rules-002		At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	f7a6af678780077a42a8dbdd71771d2de5e8a9ca	`L. David Baron`<http://dbaron.org/>	
-at-rules-003		At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	8e742cc25254b207855d9662d23cd67eee2ac7c5	`L. David Baron`<http://dbaron.org/>	
-at-rules-004		At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	3a1d380dbae263b2ba3cde60d82930752ee39951	`L. David Baron`<http://dbaron.org/>	
+at-rule-013	reference/at-rule-013-ref	Ignoring at-rules inside @media blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	5a1ce670762fad8b2a6a02b9298d4ba79de40657	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	At-rules inside @media blocks are ignored up to up to the end of the block that contains the invalid at-keyword, or up to and including the next semicolon (;) or up to and including the next block ({...}), whichever comes first.
+at-rules-000	reference/ref-this-text-should-be-green	At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	8984d98e5834069aa91748dadbba8a9f02d77936	`L. David Baron`<http://dbaron.org/>	
+at-rules-001	reference/ref-this-text-should-be-green	At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	80d762d15fd129796d6753260893d943e1f31c3c	`L. David Baron`<http://dbaron.org/>	
+at-rules-002	reference/ref-this-text-should-be-green	At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	be9cf728ee887648237b132d34b7f06b35f974b1	`L. David Baron`<http://dbaron.org/>	
+at-rules-003	reference/ref-this-text-should-be-green	At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	0f5f5bc7045648e4263be989b35d6e065cdc87a3	`L. David Baron`<http://dbaron.org/>	
+at-rules-004	reference/ref-this-text-should-be-green	At-rules		http://www.w3.org/TR/CSS21/syndata.html#at-rules	51faac3b5670dc4b9946fa92d5ee7d2c7b8d103c	`L. David Baron`<http://dbaron.org/>	
 attribute-000		Selectors: Attribute selectors: Generic match		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	08f54a50e049cfda5273d6db76eeca9d63196de9	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the elements with the specified attribute, disregarding its value
 attribute-001		Selectors: Attribute selectors: Generic match with the universal selector		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	4ae0bd0b643dbcd7426ae9d12cf7802c93ae5000	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the elements with the specified attribute, disregarding its value
 attribute-002		Selectors: Attribute selectors: Exact match		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	6eeb58ea6dc60ff14519333d25876f24c3776a0a	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the elements with the specified attribute and the specified value
@@ -597,7 +597,7 @@ attribute-006		Selectors: Attribute selectors: Substring matching		http://www.w3
 attribute-007		Selectors: Attribute selectors: Substring matching with the universal selector		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	ab89af4aeef715d8613fc069feca8777e98ffac0	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should apply each rule to the elements which have an hyphen-separated list of attribute values
 attribute-selector-001	reference/no-red-filler-text-ref	ID selector without value and no matching element		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	e3c38cd712391d73ec4b0ec9ecca15c5a8f1a517	`Microsoft`<http://www.microsoft.com/>	Attribute selector without a value matches any element which has that attribute set.
 attribute-selector-002	reference/filler-text-below-green	Attribute selector without value		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	8258ef77fe8bc269d4ad7da52844fb69831f263a	`Microsoft`<http://www.microsoft.com/>	Attribute selector without a value matches any element which has that attribute set.
-attribute-token-selector-002		[attr~=""]Attribute Selectors with Empty String Values		http://www.w3.org/TR/CSS21/syndata.html#tokenization	4fed5b2bfee5d177247a5213af1def02c6066016	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	[attr~=''] is valid but matches nothing.
+attribute-token-selector-002	reference/attribute-token-selector-002-ref	[attr~=""]Attribute Selectors with Empty String Values		http://www.w3.org/TR/CSS21/syndata.html#tokenization	e3618655002fbb5400400c7e265d1e7ab68b0ef7	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	[attr~=''] is valid but matches nothing.
 attribute-value-selector-001		Attribute selector matching value		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	5c12dacb95ba85424309f59e8355e56217f96b2f	`Microsoft`<http://www.microsoft.com/>	Selector matches attribute with specific value.
 attribute-value-selector-002		Attribute selector matching value in hyphenated list		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	b6151b834ce6a9223c730d3f9ed09a2eec1497db	`Microsoft`<http://www.microsoft.com/>	Selector matches attributes with specific value in a hyphen-separated list.
 attribute-value-selector-003		Attribute selector matching value in list		http://www.w3.org/TR/CSS21/selector.html#attribute-selectors	97394b2c006c24adcc15fda9042a154f051c936b	`Microsoft`<http://www.microsoft.com/>	Selector matches attribute with specific value in a space-separated list.
@@ -1427,6 +1427,7 @@ before-location-001		Before applies before text		http://www.w3.org/TR/CSS21/gene
 bidi-001	reference/bidi-001-ref	RLO/PDF bidi reordering across closing inline element boundary		http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/	4b17669682a01af35c7ff859a56ff14979004532	`Ian Hickson`<mailto:ian@hixie.ch>	Tests that RLO + closing inline element boundary + PDF reorders text, splitting inline and rendering borders and padding appropriately.
 bidi-002	reference/bidi-002-ref	RLO/PDF bidi reordering across closing inline element boundary + soft line break		http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	48d2d4ba08ef8b06d14ef353e9fb8caa30bb43af	`Ian Hickson`<mailto:ian@hixie.ch>	Tests that RLO + closing inline element boundary + soft line break + PDF reorders text, placing text correctly on each line while also splitting inline and rendering borders and padding appropriately.
 bidi-003	reference/bidi-003-ref	RLO/PDF bidi reordering across closing inline element boundary + opening inline boundary		http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/	4fc2169d7f75864298bca1a48c3d4d3bdb3560cf	`Ian Hickson`<mailto:ian@hixie.ch>	Tests that RLO + closing inline element boundary + opening inline element boundary + PDF reorders text, splitting inlines and rendering their borders and padding appropriately.
+bidi-004	reference/bidi-004-ref	The bidi algorithm and inlines in CSS	ahem,may21	http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-text-3/#white-space-rules,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://www.w3.org/TR/CSS21/text.html#white-space-model,http://unicode.org/reports/tr9/,http://www.w3.org/TR/html5/rendering.html#phrasing-content-0	e49d44d9a5a48b452d89967dd44efdb7e4c713c0	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-005		The bidi algorithm and inlines in CSS: embed levels and white-space: pre;		http://www.w3.org/TR/css-text-3/#letter-spacing-property,http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model,http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes,http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	9a94108988b0d806f23f5d63aec2a5b34d6aea05	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-005a	reference/bidi-005a-ref	The bidi algorithm and inlines in CSS: embed levels and white-space: pre;		http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	dda3b25eee4cf8c4fb330bf2e2a25c6e100072b4	`Ian Hickson`<mailto:ian@hixie.ch>	
 bidi-005b	reference/bidi-005b-ref	The bidi algorithm and inlines in CSS: embed levels and white-space: pre;		http://www.w3.org/TR/CSS21/box.html#bidi-box-model,http://www.w3.org/TR/CSS21/visuren.html#direction,http://unicode.org/reports/tr9/	5065a87ed526456c8053b05e995d3663e3ebe115	`Ian Hickson`<mailto:ian@hixie.ch>	
@@ -1660,7 +1661,7 @@ block-replaced-width-002	reference/block-replaced-width-002-ref	Block replaced e
 block-replaced-width-003		Block replaced elements and 'auto' specified for 'margin-left', 'margin-right' and 'height'	nonHTML,svg	http://www.w3.org/TR/CSS21/visudet.html#block-replaced-width	d286f54ab19a2a9c0e5744ee0db5ba3be7aa8fd1	`Microsoft`<http://www.microsoft.com/>	Computed value of 'auto' for 'margin-left' or margin-right' on block replaced elements becomes a used value of '0'. The 'width' is (used height) * (intrinsic ratio) if there is no intrinsic width but there is intrinsic height and ratio.
 block-replaced-width-004		Block replaced elements and 'auto' specified for 'margin-left', 'margin-right' and no intrinsic height or width	nonHTML,svg	http://www.w3.org/TR/CSS21/visudet.html#block-replaced-width	9d98220af48ccba399cbbe62b4a0e9fadfaf315d	`Microsoft`<http://www.microsoft.com/>	Computed value of 'auto' for 'margin-left' or margin-right' on block replaced elements becomes a used value of '0'. The height and width are adjusted by the constraints for block-level, non-replaced elements.
 block-replaced-width-006	reference/block-replaced-width-006-ref	Block replaced elements and 'auto' specified for 'margin-left', 'margin-right' and percentage intrinsic width	ahem,image	http://www.w3.org/TR/CSS21/visudet.html#block-replaced-width	b79cd281f175a34dd4316a4684a2bc771159c952	`Microsoft`<http://www.microsoft.com/>	Percentage intrinsic widths are evaluated against the containing block's width.
-blocks-001		Parsing nested blocks and strings in style blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#block	885a498fba496af9060d91272bb3c3f145b61958	`Microsoft`<http://www.microsoft.com/>	Blocks and strings are parsed with matching terminating pairs.
+blocks-001	reference/blocks-001-ref	Parsing nested blocks and strings in style blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#block	25e0683ce7ecb6d96c67779185a6821b13613260	`Microsoft`<http://www.microsoft.com/>	Blocks and strings are parsed with matching terminating pairs.
 blocks-002	reference/filler-text-below-green	Empty declaration block		http://www.w3.org/TR/CSS21/syndata.html#block	afb870cce31ad045094a46e7cf72986b1d3373ef	`Microsoft`<http://www.microsoft.com/>	Declaration blocks that are empty have no effect on later declarations.
 blocks-003	reference/filler-text-below-green	Rule blocks and white space		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	ee3e2dc5595f33f470f374eed87629ffd482dbb3	`Microsoft`<http://www.microsoft.com/>	White space around rule blocks do not affect the validity of the rule block.
 blocks-004	reference/no-red-filler-text-ref	Parsing square bracket blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#block	b0548b521ec6262d3d134ae81e037b41f04b984c	`Microsoft`<http://www.microsoft.com/>	Blocks and strings are parsed with matching terminating pairs of square brackets.
@@ -3740,7 +3741,7 @@ c544-valgn-003		vertical-align	ahem,image,interact	http://www.w3.org/TR/REC-CSS1
 c544-valgn-004		vertical-align	ahem,image,interact	http://www.w3.org/TR/REC-CSS1#vertical-align,http://www.w3.org/TR/CSS21/visudet.html#leading	c470b008da7151b01a31c8340b036e43bce126c4	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c545-txttrans-000		text-transform	ahem,image	http://www.w3.org/TR/REC-CSS1#text-transform,http://www.w3.org/TR/CSS21/text.html#caps-prop	7fabf215ad43b97f8a14cde922c0f7404c8ac584	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c546-txt-align-000		text-align		http://www.w3.org/TR/REC-CSS1#text-align,http://www.w3.org/TR/CSS21/text.html#alignment-prop	b3d640f06e8d498da6faec465f9da063f421827e	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
-c547-indent-000		text-indent	ahem	http://www.w3.org/TR/REC-CSS1#text-indent,http://www.w3.org/TR/CSS21/text.html#indentation-prop,http://www.w3.org/TR/CSS21/syndata.html#length-units	b545313dc540e1e8ef73f670e5bbd03036794c9b	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
+c547-indent-000	reference/c547-indent-000-ref	text-indent	ahem	http://www.w3.org/TR/REC-CSS1#text-indent,http://www.w3.org/TR/CSS21/text.html#indentation-prop,http://www.w3.org/TR/CSS21/syndata.html#length-units	5028b4f5684a246bcf9e2d3000cea5c3e90166cc	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c547-indent-001	reference/c547-indent-001-ref	text-indent		http://www.w3.org/TR/REC-CSS1#text-indent,http://www.w3.org/TR/CSS21/text.html#indentation-prop	d9e8b2d2bae07517e5cc775e7970e99983938539	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c548-leadin-000	reference/c548-leadin-000-ref	line-height	ahem	http://www.w3.org/TR/REC-CSS1#line-height,http://www.w3.org/TR/CSS21/visudet.html#leading	442a2f55c1c36b4aed885e38d6aab499ec47dc36	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c548-ln-ht-000	reference/c548-ln-ht-000-ref	line-height	ahem	http://www.w3.org/TR/REC-CSS1#line-height,http://www.w3.org/TR/CSS21/visudet.html#leading	1f697fc420f4c64f6fe2161a9e6e60669eb105f7	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
@@ -3806,7 +3807,7 @@ c5509-padn-l-001	reference/c5509-padn-l-001-ref	padding-left	ahem	http://www.w3.
 c5509-padn-l-002	reference/c5509-padn-l-002-ref	padding-left	invalid	http://www.w3.org/TR/REC-CSS1#padding-left,http://www.w3.org/TR/CSS21/box.html#padding-properties	2e30c1c3e5af75d1b110c1bfcc2cabef77ecce18	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c5509-padn-l-003	reference/c5509-padn-l-003-ref	padding-left	image,invalid	http://www.w3.org/TR/REC-CSS1#padding-left,http://www.w3.org/TR/CSS21/box.html#padding-properties	95302550f100c9c00e0004078c3518b23ffc5111	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c5510-ipadn-000	reference/c5510-ipadn-000-ref	padding	ahem,image	http://www.w3.org/TR/REC-CSS1#padding,http://www.w3.org/TR/CSS21/box.html#padding-properties	8a0006009d9e79f604c4b8771964d4c3010c3778	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
-c5510-padn-000		padding	ahem,image	http://www.w3.org/TR/REC-CSS1#padding,http://www.w3.org/TR/CSS21/box.html#padding-properties,http://www.w3.org/TR/CSS21/syndata.html#length-units	9e3bb1b79261f42733d70a85ca5afd221c0a880c	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
+c5510-padn-000	reference/c5510-padn-000-ref	padding	ahem,image	http://www.w3.org/TR/REC-CSS1#padding,http://www.w3.org/TR/CSS21/box.html#padding-properties,http://www.w3.org/TR/CSS21/syndata.html#length-units	bcac38c1866b3173ecb6ab523d5a5027c0d7899b	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c5510-padn-001	reference/c5510-padn-001-ref	padding	ahem	http://www.w3.org/TR/REC-CSS1#padding,http://www.w3.org/TR/CSS21/box.html#padding-properties	f2a7912bf3dde9319c0f6a17874df1bd3347e515	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c5510-padn-002	reference/c5510-padn-002-ref	padding	invalid	http://www.w3.org/TR/REC-CSS1#padding,http://www.w3.org/TR/CSS21/box.html#padding-properties	3d7dbc341cbe8b527118f554c7f8c85290dfc584	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
 c5511-brdr-tw-000		border-top-width		http://www.w3.org/TR/REC-CSS1#border-top-width,http://www.w3.org/TR/CSS21/box.html#border-properties	aa773e312e2dd6e13c4260f8480bdbf1bc3ca228	`CSS1 Test Suite Contributors`<http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html>,`Ian Hickson`<mailto:ian@hixie.ch>	
@@ -3947,22 +3948,22 @@ 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		Dynamic sheet append (<style>)		http://www.w3.org/TR/CSS21/selector.html	b5f3a400c40bb654af7aa6014ac6fba015f7f37e	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-002		Dynamic sheet append (<link>)		http://www.w3.org/TR/CSS21/selector.html	41dc89841b559d321bbff087120fb54eb40bdc51	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-003		Dynamic sheet insertion (<style>)		http://www.w3.org/TR/CSS21/selector.html	13ba6697a066d47b3f37b385ab18c5da2299d3c5	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-004		Dynamic sheet insertion (<link>)		http://www.w3.org/TR/CSS21/selector.html	3824d204a805c7402b0f8cecfbcf59262bdf3856	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-005		Dynamic sheet deletion (<style>)		http://www.w3.org/TR/CSS21/selector.html	2aa3461fd87b746d2def1e504fc45ee9a3e85dfd	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-006		Dynamic sheet deletion (<link>)		http://www.w3.org/TR/CSS21/selector.html	9a6ba30b25cce1559207b614c7adb355e9379458	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-cascade-import-dynamic-control		Control test		http://www.w3.org/TR/CSS21/selector.html	c88ded9138267f7a9b7f40d6c6532a52bd1d5d80	`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	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-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		Case-sensitivity of Properties and Keywords (background)		http://www.w3.org/TR/CSS21/syndata.html#characters	b81e96602f56f392210761f44ce629582ced9712	`L. David Baron`<http://dbaron.org/>	
-case-sensitive-001		Case-sensitivity of At-rules (@media)		http://www.w3.org/TR/CSS21/syndata.html#characters	af75dbbc93201e15c5af8fdb794c07f75def7a29	`L. David Baron`<http://dbaron.org/>	
-case-sensitive-003		Case-sensitivity of pseudo-classes and pseudo-elements		http://www.w3.org/TR/CSS21/syndata.html#characters	3d8779c327d94a2c99ff24fc727185332574ff63	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	Pseudo-class and pseudo-element names are ASCII case-insensitive.
-case-sensitive-004		Case-sensitivity of :lang() arguments		http://www.w3.org/TR/CSS21/syndata.html#characters	a84e22e78bd2d6a772a1fdc1f1a472b51397865d	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	The argument to :lang() is ASCII case-insensitive.
-case-sensitive-005		Case-sensitivity of counter names		http://www.w3.org/TR/CSS21/syndata.html#characters	0ed83a25320adfc9649a4b228376f90aeb858f7a	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	Counter names are case-sensitive.
-case-sensitive-006		Case sensitivity with element selectors	HTMLonly	http://www.w3.org/TR/CSS21/syndata.html#characters	302684114f5129f4afcd4f7c8f5e92f3d37e5015	`Microsoft`<http://www.microsoft.com/>	Element selectors are case-insensitive in HTML.
-case-sensitive-007		Case sensitivity with element selectors	nonHTML	http://www.w3.org/TR/CSS21/syndata.html#characters	1d6ba3ce822afad528c41bc7874e87b7310ecbae	`Microsoft`<http://www.microsoft.com/>	Element selectors are case-sensitive in XHTML and XML.
+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/>	
+case-sensitive-001	reference/ref-green-background	Case-sensitivity of At-rules (@media)		http://www.w3.org/TR/CSS21/syndata.html#characters	38908f97e5c56f38f4c2807bd5945d77580e75f4	`L. David Baron`<http://dbaron.org/>	
+case-sensitive-003	reference/case-sensitive-003-ref	Case-sensitivity of pseudo-classes and pseudo-elements		http://www.w3.org/TR/CSS21/syndata.html#characters	1e07287509efaccf3f3adfe46d062f0ea27a0aeb	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	Pseudo-class and pseudo-element names are ASCII case-insensitive.
+case-sensitive-004	reference/case-sensitive-003-ref	Case-sensitivity of :lang() arguments		http://www.w3.org/TR/CSS21/syndata.html#characters	723fdbbe5941d318118e86cf5ae161312de476d2	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	The argument to :lang() is ASCII case-insensitive.
+case-sensitive-005	reference/case-sensitive-005-ref	Case-sensitivity of counter names		http://www.w3.org/TR/CSS21/syndata.html#characters	dfd0240ea392700c15e32a28eec725b6db820f94	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	Counter names are case-sensitive.
+case-sensitive-006	reference/filler-text-below-green	Case sensitivity with element selectors	HTMLonly	http://www.w3.org/TR/CSS21/syndata.html#characters	22e1a8c5e8284dd76b4937bb74102888636a7325	`Microsoft`<http://www.microsoft.com/>	Element selectors are case-insensitive in HTML.
+case-sensitive-007	reference/no-red-filler-text-ref	Case sensitivity with element selectors	nonHTML	http://www.w3.org/TR/CSS21/syndata.html#characters	07b1170801ad9349fabaf98db0ece9a247c6bbb5	`Microsoft`<http://www.microsoft.com/>	Element selectors are case-sensitive in XHTML and XML.
 case-sensitive-008		Case sensitive attributes		http://www.w3.org/TR/CSS21/syndata.html#characters	8cf1bfbdf626dc47463dec1641223a3070ad05bb	`Microsoft`<http://www.microsoft.com/>	CSS style sheets parts that are not under the control of CSS are case dependant on the language being used.
 character-encoding-001		html utf8, css http iso1	http	http://www.w3.org/TR/CSS21/syndata.html#charset	fb6776fd6b89a215898ffd2f8a2939bca234fd6d	`Richard Ishida`<http://rishida.net>	The user agent respects the encoding of a css stylesheet declared in HTTP.
 character-encoding-002		html utf8, css http iso15	http	http://www.w3.org/TR/CSS21/syndata.html#charset	a5efac9a86c65d05f20a0fa181426d12ad28936f	`Richard Ishida`<http://rishida.net>	The user agent respects the encoding of a css stylesheet declared in HTTP.
@@ -4156,7 +4157,7 @@ collapsing-table-borders-011		All of table header group border can be specified
 collapsing-table-borders-012		Part of table header group border can be specified		http://www.w3.org/TR/CSS21/tables.html#collapsing-borders	9e7eb2520240c06a282636b20e3e31eba4d6aa24	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	A specific side of a table header group can be specified under the collapsing border model.
 collapsing-table-borders-013		All of table footer group border can be specified		http://www.w3.org/TR/CSS21/tables.html#collapsing-borders	2425e935a93245af43e6922e56effa6bb541e432	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	The borders for all four sides of a table footer group can be specified under the collapsing border model.
 collapsing-table-borders-014		Part of table footer group border can be specified		http://www.w3.org/TR/CSS21/tables.html#collapsing-borders	bb347371ce31725381b1c7682b23a16eb03e0dc5	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	A specific side of a table header group can be specified under the collapsing border model.
-color-000		RGB color syntax error handling	invalid	http://www.w3.org/TR/CSS21/syndata.html#color-units	6c4732b9fe2e1f09af0a29820e0e5a0eb279aecb	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+color-000	reference/color-000-ref	RGB color syntax error handling	invalid	http://www.w3.org/TR/CSS21/syndata.html#color-units	ca24ae2e01e2d7574ff1b1d74d1a080e818e4e98	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
 color-001	reference/color-001-ref	Color set to hex with 5 digits which is invalid and is equivalent to minimum minus one value for 6 digit hex	ahem,invalid	http://www.w3.org/TR/CSS21/colors.html#propdef-color,http://www.w3.org/TR/CSS21/colors.html#colors	4fe843dcf45097eea8978a4189a5b46d832f8e70	`Microsoft`<http://www.microsoft.com/>	The 'color' set to '#00000' falls back to the initial value and renders the correct foreground color of an element's text content.
 color-002	reference/color-002-ref	Color set to hex with six digits with the minimum value, #000000	ahem	http://www.w3.org/TR/CSS21/colors.html#propdef-color,http://www.w3.org/TR/CSS21/colors.html#colors	36ca41bee49b8ed661d8b380c370d02047ea70b7	`Microsoft`<http://www.microsoft.com/>	The 'color' set to '#000000' renders the correct foreground color of an element's text content.
 color-003	reference/color-003-ref	Color set to hex with six digits with the minimum plus one value, #010101	ahem	http://www.w3.org/TR/CSS21/colors.html#propdef-color,http://www.w3.org/TR/CSS21/colors.html#colors	10bac3b32c9c26e52dfdb953320d13b7f7635f97	`Microsoft`<http://www.microsoft.com/>	The 'color' set to '#010101' renders the correct foreground color of an element's text content.
@@ -4326,7 +4327,7 @@ colors-002	reference/no-red-filler-text-ref	Parsing invalid hexadecimal RGB unit
 colors-003	reference/no-red-filler-text-ref	Parsing invalid RGB functional notation - two values	invalid	http://www.w3.org/TR/CSS21/syndata.html#color-units	976e7941d0c4e7dd7d2efb3128d4b84a87fe2f9a	`Microsoft`<http://www.microsoft.com/>	An RGB value is invalid if it has only two values.
 colors-004	reference/no-red-filler-text-ref	Parsing invalid RGB functional notation - Percentages and Numbers	invalid	http://www.w3.org/TR/CSS21/syndata.html#color-units	36345dd6e5ad3f371f043088abfa13ca99e41516	`Microsoft`<http://www.microsoft.com/>	An RGB value is invalid if it has both percentages and number assignments.
 colors-005	reference/filler-text-below-green	Clipping of RGB color values		http://www.w3.org/TR/CSS21/syndata.html#color-units	c218498e6af442dded6851a98d922339d54944de	`Microsoft`<http://www.microsoft.com/>	Values outside the device gamut are clipped: the red, green, and blue values are changed to fall within the range supported by the device.
-colors-006		Comparing color keywords and hex values		http://www.w3.org/TR/CSS21/syndata.html#color-units	c13c1101c45fe22f51d13f7b089dab1bb5959dad	`Microsoft`<http://www.microsoft.com/>	Color matching of keywords and hex values.
+colors-006	reference/colors-006-ref	Comparing color keywords and hex values		http://www.w3.org/TR/CSS21/syndata.html#color-units	9e61b368ce600ee7b7fbb1db36ee314f4d439ec1	`Microsoft`<http://www.microsoft.com/>	Color matching of keywords and hex values.
 colors-007	reference/colors-007-ref	Color keyword syntax	invalid	http://www.w3.org/TR/CSS21/syndata.html#color-units	aecf600a687dae2592618f11e8ddeb796bf20eb4	`Germain Garand`<mailto:germain@ebooksfrance.org>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	
 column-background-001		Column background property		http://www.w3.org/TR/CSS21/tables.html#columns	9cac04c0174b9fde18f07c7a31ad462f8a5beaec	`Microsoft`<http://www.microsoft.com/>	A background can be set on a table column.
 column-background-002		Column-group background property		http://www.w3.org/TR/CSS21/tables.html#columns	89f4cb55b4276c885e384ec922d64d516644a4b0	`Microsoft`<http://www.microsoft.com/>	A background can be set on a table column group.
@@ -4523,23 +4524,23 @@ content-attr-002		Generated Content from Attributes		http://www.w3.org/TR/CSS21/
 content-attr-case-001		Content property attr(x) case sensitivity	HTMLonly	http://www.w3.org/TR/CSS21/generate.html#content	931b842f10ec40ae8fbd9b273ae7247d1596ff48	`Microsoft`<http://www.microsoft.com/>	The attr(x) function selects the attribute even when case does not match.
 content-attr-case-002		content attr(x) case sensitivity	nonHTML	http://www.w3.org/TR/CSS21/generate.html#content	8f51b48e369494bfb30ac28c19acfd57462413e2	`Microsoft`<http://www.microsoft.com/>	Verify in XHTML that attr(x) does not select the attribute when the case does not match
 content-auto-reset-001		Content property on out of scope counter		http://www.w3.org/TR/CSS21/generate.html#content	073f16d82ce968e2b8068bfa814e1766852b4f2b	`Microsoft`<http://www.microsoft.com/>	If content refers to a counter that is not in scope, it is assumed that a counter-reset has occurred and the counter is reset to zero.
-content-counter-000		content: counter(c)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	6ff4653f5730ac9088be78dcf2d4c261d64ef54f	`L. David Baron`<http://dbaron.org/>	
-content-counter-001		content: counter(c, none)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	2d4000d7dfee00f305de20e4dba071b31b71b5fc	`L. David Baron`<http://dbaron.org/>	
-content-counter-002		content: counter(c, disc)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	076d4cdf37485dd8628c748975e09d29db73ab60	`L. David Baron`<http://dbaron.org/>	
-content-counter-003		content: counter(c, circle)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	bab024d65a02120fa6cd0aa09637a10ed5aee69e	`L. David Baron`<http://dbaron.org/>	
-content-counter-004		content: counter(c, square)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	daee752433971aed31e44b1efcfa832ac4e2afc4	`L. David Baron`<http://dbaron.org/>	
-content-counter-005		content: counter(c, decimal)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	80b6192bb1de6e73df8f3912da8482454ae76435	`L. David Baron`<http://dbaron.org/>	
-content-counter-006		content: counter(c, decimal-leading-zero)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	1964bbae7185f2d0893a673a7e55dedf3275c27a	`L. David Baron`<http://dbaron.org/>	
-content-counter-007		content: counter(c, lower-roman)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	40cd168e5c3c4e17f8f71ae08002ef801fdbe4e2	`L. David Baron`<http://dbaron.org/>	
-content-counter-008		content: counter(c, upper-roman)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	dc4663bd553f4783fc026a11a47549a23195672f	`L. David Baron`<http://dbaron.org/>	
-content-counter-009		content: counter(c, georgian)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	45b5456dec98668404d7f75e294c68b7c3c7d3a7	`L. David Baron`<http://dbaron.org/>	
-content-counter-010		content: counter(c, armenian)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	85f277369296d43b2a97462aaad3afad419a75c5	`L. David Baron`<http://dbaron.org/>	
-content-counter-011		content: counter(c, lower-latin)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	38f78d3a02140698f9f36e4e66caf7a8a114924c	`L. David Baron`<http://dbaron.org/>	
-content-counter-012		content: counter(c, lower-alpha)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	262223d39bfdca89c0b2a5a0b6c4ff960340c04b	`L. David Baron`<http://dbaron.org/>	
-content-counter-013		content: counter(c, upper-latin)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	37fa19ffd8d1749fe27d9ca830478de18961e360	`L. David Baron`<http://dbaron.org/>	
-content-counter-014		content: counter(c, upper-alpha)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	6b618722cc4059245802209a49507d6ab259a897	`L. David Baron`<http://dbaron.org/>	
-content-counter-015		content: counter(c, lower-greek)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	17c57dc225d1487501f391947de26e30784f174b	`L. David Baron`<http://dbaron.org/>	
-content-counter-016		content: counter() error cases	invalid	http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	0e8097ae6a831474b897f3d1bfe3ac6fe8a71a4f	`L. David Baron`<http://dbaron.org/>	
+content-counter-000	reference/content-counter-000-ref	content: counter(c)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	11a2ca2e1625c9268277f0ae67b69128862f171f	`L. David Baron`<http://dbaron.org/>	
+content-counter-001	reference/content-counter-001-ref	content: counter(c, none)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	6025d32b5faf432b7db5d2dc6a86a7f918eab347	`L. David Baron`<http://dbaron.org/>	
+content-counter-002	reference/content-counter-002-ref	content: counter(c, disc)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	b727ca27087e54c660556698aeb4e2691fbd7f1e	`L. David Baron`<http://dbaron.org/>	
+content-counter-003	reference/content-counter-003-ref	content: counter(c, circle)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	ea6873221451dc051d7d39f57cf9590929f2b095	`L. David Baron`<http://dbaron.org/>	
+content-counter-004	reference/content-counter-004-ref	content: counter(c, square)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	1804360449e7dcacd807665ec76f7cb8a082e533	`L. David Baron`<http://dbaron.org/>	
+content-counter-005	reference/content-counter-000-ref	content: counter(c, decimal)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	e5e2dcaa12ce6c05395cc2a154faea8c346244c4	`L. David Baron`<http://dbaron.org/>	
+content-counter-006	reference/content-counter-006-ref	content: counter(c, decimal-leading-zero)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	60af386f2e0b740e18fac2acd83e97eaecf691a9	`L. David Baron`<http://dbaron.org/>	
+content-counter-007	reference/content-counter-007-ref	content: counter(c, lower-roman)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	d3ce627b17aca8abec2557640c9f35e159c02d56	`L. David Baron`<http://dbaron.org/>	
+content-counter-008	reference/content-counter-008-ref	content: counter(c, upper-roman)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	bc64d3cce436d53d0bf8166aae7b22803d6693c1	`L. David Baron`<http://dbaron.org/>	
+content-counter-009	reference/content-counter-009-ref	content: counter(c, georgian)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	a9aafc684b0e5b623ce9520c360d423ee1706dd4	`L. David Baron`<http://dbaron.org/>	
+content-counter-010	reference/content-counter-010-ref	content: counter(c, armenian)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	56813f4c1ed618619def341ed848daf47540947d	`L. David Baron`<http://dbaron.org/>	
+content-counter-011	reference/content-counter-011-ref	content: counter(c, lower-latin)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	d3c3bfb6175c84692c6419a502c1c22362955b73	`L. David Baron`<http://dbaron.org/>	
+content-counter-012	reference/content-counter-011-ref	content: counter(c, lower-alpha)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	bfc02df4837b1a0bd3f01063b36d0403d516bf60	`L. David Baron`<http://dbaron.org/>	
+content-counter-013	reference/content-counter-013-ref	content: counter(c, upper-latin)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	4cabc3c2cd7ff5944c34c7d9d18c6883a659eff5	`L. David Baron`<http://dbaron.org/>	
+content-counter-014	reference/content-counter-013-ref	content: counter(c, upper-alpha)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	ddcd420e2e98c3d014e371ffe29f6b7c6272e345	`L. David Baron`<http://dbaron.org/>	
+content-counter-015	reference/content-counter-015-ref	content: counter(c, lower-greek)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	8652857772d3cd8502a36faafb6d06c6e9fcce92	`L. David Baron`<http://dbaron.org/>	
+content-counter-016	reference/content-counter-000-ref	content: counter() error cases	invalid	http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	64fc24683094a2c4e0853961ccc603ed280e280b	`L. David Baron`<http://dbaron.org/>	
 content-counters-000		content: counters(c, ".")		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	37f716a432f241d959844929de83b20c6c90dffc	`L. David Baron`<http://dbaron.org/>	
 content-counters-001		content: counters(c, ".", none)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	946807cce0df4e9aa9179fde59d2862b5be752bd	`L. David Baron`<http://dbaron.org/>	
 content-counters-002		content: counters(c, ".", disc)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	e2cf3dd87e01d47399d1eba04aecff1215a4c345	`L. David Baron`<http://dbaron.org/>	
@@ -4558,7 +4559,7 @@ content-counters-014		content: counters(c, ".", upper-alpha)		http://www.w3.org/
 content-counters-015		content: counters(c, ".", lower-greek)		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	89b623eb9a300a7cdb0d2550c76fbcc0b9b6b015	`L. David Baron`<http://dbaron.org/>	
 content-counters-016		content: counters() string argument		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	8a041e883e06a9f7d449e78d0ad74e871f05f460	`L. David Baron`<http://dbaron.org/>	
 content-counters-017		content: counters() string argument		http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	8ee8101890c572a67d83109f8888ee6ead2a7a11	`L. David Baron`<http://dbaron.org/>	
-content-counters-018		content: counters() error cases	invalid	http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	7ebc36bcb3ce13ea5c7a302ee0f9223b63ce5f6d	`L. David Baron`<http://dbaron.org/>	
+content-counters-018		content: counters() error cases	invalid	http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter,http://www.w3.org/TR/CSS21/generate.html#counter-styles	d29f8f57d8a58c07f04ff0ca2262a61512c8e01e	`L. David Baron`<http://dbaron.org/>	
 content-inherit-001		CSS inheritance: content		http://www.w3.org/TR/CSS21/generate.html#content	0132da54d690965b7a7351def8d7590f84163114	`Ian Hickson`<mailto:ian@hixie.ch>	
 content-inherit-002	reference/content-inherit-002-ref	CSS inheritance: content with tables		http://www.w3.org/TR/CSS21/generate.html#content	b6b042df531374236f9bc0067496667c5e45038c	`Ian Hickson`<mailto:ian@hixie.ch>	
 content-newline-001		Content property \A creates newline		http://www.w3.org/TR/CSS21/generate.html#content	1ba88d62fa00bed7b19362811b21dcc9ca2d346a	`Microsoft`<http://www.microsoft.com/>	A '\A' creates a newline for strings in the content property.
@@ -4570,14 +4571,14 @@ content-white-space-002		Content property and white-space: pre		http://www.w3.or
 content-white-space-003		Content property and white-space: nowrap		http://www.w3.org/TR/CSS21/generate.html#content	62fb8054cc466b47fc436ee7fd35c5bb5828c8cc	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>,`Microsoft`<http://www.microsoft.com/>	'white-space: nowrap' applies to generated string content.
 content-white-space-004		Content property and white-space: nowrap		http://www.w3.org/TR/CSS21/generate.html#content	985d2b077592ab7e423e726b15d9784e9dc207f3	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>,`Microsoft`<http://www.microsoft.com/>	'white-space: normal' applies to generated string content.
 control-characters-002		Control Characters		http://www.w3.org/TR/CSS21/text.html#spacing-props	c7713c650b5c7708c47505b3bfc15b077239a3da	`Microsoft`<http://www.microsoft.com/>	Handling and processing of control characters.
-core-syntax-001		Nested blocks in unexpected places		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	942e0b3950668dd1a7d9b5958e66412e59ecafbb	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-002		Nested blocks in unexpected places		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	8a4cb98dfcc595f7f764192ce62c871d9c94cfbb	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-003		Nested blocks in unexpected places (with no whitespace)		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	873f4b9f5d257aafffa6611d61180c93b0a50a05	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-004		Nested blocks in unexpected places (with no whitespace)		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	e08cc6233aa06515f7f866ee87d3a7302e5ddde5	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-006		Parsing invalid '!' declarations		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	74a3f7993987f38e3f549eda06832ce2cc9c7e50	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-007		Parsing invalid '!' declarations		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	04bc57ca78dcf7216a85a7a7d605023c64c1ea39	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-008		Parsing invalid '!' declarations		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	03b0d944a77bd154356494ff6c3aedc8b24adc0d	`Ian Hickson`<mailto:ian@hixie.ch>	
-core-syntax-009		Syntactic White Space		http://www.w3.org/TR/CSS21/syndata.html#tokenization	839e7f814148a1dd8388f46a03e83ff5d92d4b53	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	Only the characters U+0020, U+0009, U+000A, U+000D, and U+000C are considered white space.
+core-syntax-001	reference/core-syntax-001-ref	Nested blocks in unexpected places		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	8083a54de86162213a3876de01711fb1bda55453	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-002	reference/core-syntax-002-ref	Nested blocks in unexpected places		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	7e37a042ce73df682857a6b4c4c94890c24cc4d9	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-003	reference/ref-this-text-should-be-green	Nested blocks in unexpected places (with no whitespace)		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	1fcbb868190723c21e7af574ee784217aa6a9e2a	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-004	reference/ref-this-text-should-be-green	Nested blocks in unexpected places (with no whitespace)		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	c48a1e0d48c850e686716edbf17a8fa2ecc2c2a2	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-006	reference/core-syntax-006-ref	Parsing invalid '!' declarations		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	094571a3d3d620642722fa494259ee46d718abab	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-007	reference/core-syntax-007-ref	Parsing invalid '!' declarations		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	d6a2644d5ffff6a813bf16218760610e35b15a9d	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-008	reference/ref-this-text-should-be-green	Parsing invalid '!' declarations		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	bbcab0c5f9c6e255999b84544cc685740ae5cc85	`Ian Hickson`<mailto:ian@hixie.ch>	
+core-syntax-009	reference/ref-this-text-should-be-green	Syntactic White Space		http://www.w3.org/TR/CSS21/syndata.html#tokenization	076d16691c7b45f55ff243c92db47980147260eb	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	Only the characters U+0020, U+0009, U+000A, U+000D, and U+000C are considered white space.
 counter-increment-000		dynamic changes to 'counter-increment'	dom	http://www.w3.org/TR/CSS21/generate.html#counters,http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter	98bf04bbbc1c567e751a0ff86f3d02e2a8bbb538	`L. David Baron`<http://dbaron.org/>	
 counter-increment-001		dynamic changes to 'counter-increment'	dom	http://www.w3.org/TR/CSS21/generate.html#counters,http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter	ff216513d622f9b04a7824cc4a717966264e4bd1	`L. David Baron`<http://dbaron.org/>	
 counter-increment-002		dynamic changes to 'counter-increment'	dom	http://www.w3.org/TR/CSS21/generate.html#counters,http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter	e1d9df2b37993e35b47dc27460508fa47973218f	`L. David Baron`<http://dbaron.org/>	
@@ -4740,16 +4741,16 @@ counter-reset-multiple-001		Multiple 'counter-reset' before 'counter' use		http:
 counter-reset-not-generated-001		Counter-reset on pseudo-element that is not generated		http://www.w3.org/TR/CSS21/generate.html#content	6a127087f9f8e23315d64a2ba4825cd7a16e4a2a	`Microsoft`<http://www.microsoft.com/>	Pseudo-elements that are not generated do not reset counters.
 counter-reset-sibling-001		Counter-reset on later siblings		http://www.w3.org/TR/CSS21/generate.html#scope	66345146613b01479d3e2fc77d57f0463fa8a5b9	`Microsoft`<http://www.microsoft.com/>	Setting 'counter-reset' on later siblings does not have an effect on previous counters.
 counter-reset-visibility-001		Counter-reset on visibility: hidden element		http://www.w3.org/TR/CSS21/generate.html#content	1cab5174ffa04bd5d112e94f17489e418464073d	`Microsoft`<http://www.microsoft.com/>	Elements that are set to 'visibility: hidden' reset counters.
-counters-001		Parsing counter functions with just the identifier		http://www.w3.org/TR/CSS21/syndata.html	6113e3ff9dd80acb041d2da3dfcd9e31037cb675	`Microsoft`<http://www.microsoft.com/>	Counters can be referred to using only the identifier.
+counters-001	reference/counters-001-ref	Parsing counter functions with just the identifier		http://www.w3.org/TR/CSS21/syndata.html	3e07ae612bfb6ac4fce69746122108a28f80e11e	`Microsoft`<http://www.microsoft.com/>	Counters can be referred to using only the identifier.
 counters-002	reference/no-red-filler-text-ref	Parsing invalid counter functions - Too many arguments	invalid	http://www.w3.org/TR/CSS21/syndata.html	8bd15cebb49e35998d688a75c414ad46232a9a4d	`Microsoft`<http://www.microsoft.com/>	A counter is invalid if it has too many arguments.
-counters-003		Parsing counter() function with no white space		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	a9652d5d44b11fff426413a138b9f7565805eca3	`Microsoft`<http://www.microsoft.com/>	The counter function can be parsed with no white space separating the function values.
-counters-004		Parsing counters() function with no white space and two function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	ca6b735e6c15b5fc114953b4d5d0bebeb5c8d2af	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with no white space separating the two function values.
-counters-005		Parsing counters() function with no white space and three function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	a161572ada1da0d5d4cca30acbf07dde32431290	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with no white space separating the three function values.
-counters-006		Parsing counter() function with white space		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	10077d6c77ffff9afde9bcc8a6adf7a72648e973	`Microsoft`<http://www.microsoft.com/>	The counter function can be parsed with white space separating the function value.
-counters-007		Parsing counter() function with white space and two function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	ba41778ba917abc0cdbf4c14263f482adb2aa79a	`Microsoft`<http://www.microsoft.com/>	The counter function can be parsed with white space separating the two function values.
-counters-008		Parsing counters() function with white space and two function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	516cb34d33ff0cea02072a06ffad392d8daca7a4	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with white space separating the two function values.
-counters-009		Parsing counters() function with white space and three function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	fc91b50078a544326b295f6821be28341c348f5b	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with white space separating the three function values.
-counters-010		Parsing counters() functions		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	60ba9f330132aca869796db6f27fbccad2f0b16d	`Microsoft`<http://www.microsoft.com/>	To refer to a sequence of nested counters of the same name, the notation is 'counters(identifier, string)' or 'counters(identifier, string, list-style-type)'.
+counters-003	reference/counters-003-ref	Parsing counter() function with no white space		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	bcbed4c9e500741ac0c9bc9f28b9f87640adf2d3	`Microsoft`<http://www.microsoft.com/>	The counter function can be parsed with no white space separating the function values.
+counters-004	reference/counters-004-ref	Parsing counters() function with no white space and two function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	db4d1f67d03c13cafc3526f1856c68163f1638c0	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with no white space separating the two function values.
+counters-005	reference/counters-003-ref	Parsing counters() function with no white space and three function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	720be39020ed3460c26dd76fff76c7bca9f06604	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with no white space separating the three function values.
+counters-006	reference/counters-004-ref	Parsing counter() function with white space		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	9c345f1079b63c64ac919d2fd6f008c83af57621	`Microsoft`<http://www.microsoft.com/>	The counter function can be parsed with white space separating the function value.
+counters-007	reference/counters-003-ref	Parsing counter() function with white space and two function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	5a16289544caa4a3faa3c5e3b9fe9898d6b22452	`Microsoft`<http://www.microsoft.com/>	The counter function can be parsed with white space separating the two function values.
+counters-008	reference/counters-004-ref	Parsing counters() function with white space and two function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	67557c4f4821dee22661612563235c42d98eb6d9	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with white space separating the two function values.
+counters-009	reference/counters-003-ref	Parsing counters() function with white space and three function values		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	06082522a1b91e8fcdcc28caad73ccead4612db1	`Microsoft`<http://www.microsoft.com/>	The counters function can be parsed with white space separating the three function values.
+counters-010	reference/counters-010-ref	Parsing counters() functions		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	8e39dea6b9daf37c22c21928909a5d60e9d09971	`Microsoft`<http://www.microsoft.com/>	To refer to a sequence of nested counters of the same name, the notation is 'counters(identifier, string)' or 'counters(identifier, string, list-style-type)'.
 counters-hidden-000		Counter properties on 'content: none' pseudo-elements		http://www.w3.org/TR/CSS21/generate.html#undisplayed-counters,http://www.w3.org/TR/CSS21/generate.html#counters,http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter	bd9d69c668a4c34ef908773dec75e9d9b23217bc	`L. David Baron`<http://dbaron.org/>	
 counters-hidden-001		Counter properties on 'display: none' elements		http://www.w3.org/TR/CSS21/generate.html#undisplayed-counters,http://www.w3.org/TR/CSS21/generate.html#counters,http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter	90badbb3c30aeb489a7b10f814c475f19a44873b	`L. David Baron`<http://dbaron.org/>	
 counters-hidden-002		Counter properties on 'visibility: hidden' elements		http://www.w3.org/TR/CSS21/generate.html#undisplayed-counters,http://www.w3.org/TR/CSS21/generate.html#counters,http://www.w3.org/TR/CSS21/generate.html#propdef-content,http://www.w3.org/TR/CSS21/syndata.html#counter	f0698e4fc74ee3f1a97a54f165dcb59fdbfc3f3b	`L. David Baron`<http://dbaron.org/>	
@@ -4811,14 +4812,14 @@ data-alignment-001		Aligning Table Data (cell data is vertically aligned)		http:
 data-alignment-002		Aligning Table Data (cell data is horizontally aligned)		http://www.w3.org/TR/CSS21/tables.html#tables-intro	48e0f7e3d9d0904667a796905f3e14f029069e4e	`Microsoft`<http://www.microsoft.com/>	Cell data can be horizontally aligned.
 data-alignment-003		Aligning Table Data (row data is aligned)		http://www.w3.org/TR/CSS21/tables.html#tables-intro	1a48d3387129d1a110ed012c79bb4fbbb19356f2	`Microsoft`<http://www.microsoft.com/>	Cell data in a row can be horizontally and vertically aligned.
 data-alignment-004		Aligning Table Data (column data is aligned)		http://www.w3.org/TR/CSS21/tables.html#tables-intro	44a7310baace02501053a401a43a15af6dc56c07	`Microsoft`<http://www.microsoft.com/>	Alignment of cell data in a column is achieved by specifying alignment properties on the cells themselves, and not on the column element directly.
-declaration-001		malformed declaration missing ':', value, part 1	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	095c86373e6d5d590c0a6375c4985fae6643b580	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-declaration-002		malformed declaration missing ':', value, part 2	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	adfb129e5f9603546eed178060d6291b0bb46fc8	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-declaration-003		malformed declaration missing value, part 1	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	3467772ab02d8cf4f6e8db92d67f78a45c5a08ed	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-declaration-004		malformed declaration missing value, part 2	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	5f903bc94910a17cf54455d842220d5576e517d3	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-declaration-005		malformed declaration: unexpected tokens { }, part 1	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	95db203b752dcabadbd37613cef6197d35df06e8	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
-declaration-006		malformed declaration: unexpected tokens { }, part 2	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	3b453f15b1e5032f219e2f01634dd45ef92db5a7	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+declaration-001	reference/ref-this-text-should-be-green	malformed declaration missing ':', value, part 1	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	1af32cb684b11037144de9919d9859ba02764ad1	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+declaration-002	reference/ref-this-text-should-be-green	malformed declaration missing ':', value, part 2	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	a48e24b0d9191620333018e11ff46799978e9f87	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+declaration-003	reference/ref-this-text-should-be-green	malformed declaration missing value, part 1	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	72845a03c759b28ecc8cf33d5ec06eb4e9b681f6	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+declaration-004	reference/ref-this-text-should-be-green	malformed declaration missing value, part 2	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	83e2fd179cff2a88af05454e454dd4497f945f1a	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+declaration-005	reference/ref-this-text-should-be-green	malformed declaration: unexpected tokens { }, part 1	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	3e1dfb793750423037cbdbdc5cb2a6d554601690	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+declaration-006	reference/ref-this-text-should-be-green	malformed declaration: unexpected tokens { }, part 2	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	9bf6509156021a455a0d7253827efef3ca5f16fd	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
 declaration-whitespace-001	reference/filler-text-below-green	Parsing white space in style declaration		http://www.w3.org/TR/CSS21/syndata.html#declaration	79fca0c7e336d7a18f329e98541010ecf2360266	`Microsoft`<http://www.microsoft.com/>	Various white space are allowed anywhere within the declaration and are ignored.
-declarations-009		Ignoring at-rules inside declaration blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	8658b351e7b0b401d301940dfe5d6599e1e7fd00	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	At-rules inside declaration blocks are parsed as malformed declarations.
+declarations-009	reference/declarations-009-ref	Ignoring at-rules inside declaration blocks	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	a005a9b38569d3fab5961e163e9b08e1430b90e5	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	At-rules inside declaration blocks are parsed as malformed declarations.
 default-attribute-selector-001	reference/ref-filled-green-100px-square	attribute selector - Default attribute values in DTDs		http://www.w3.org/TR/CSS21/selector.html#default-attrs,http://www.w3.org/TR/CSS21/selector.html#matching-attrs	88e74e354d85ae30af28b990fe3e0731a24a9f9e	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Default attribute values may be declared in an external resource such as a DTD. In such case, the default attributes may or may not appear in the document tree. When default attributes appear in the document tree, then their correspondent default values must be included.
 default-attribute-selector-002	reference/ref-filled-green-100px-square	attribute selector - Default attribute values in DTDs		http://www.w3.org/TR/CSS21/selector.html#default-attrs,http://www.w3.org/TR/CSS21/selector.html#matching-attrs	511e185ad1b86f7540f3b1e4f1047e6648caf72e	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Default attribute values may be declared in an external resource such as a DTD. In such case, the default attributes may or may not appear in the document tree. When default attributes appear in the document tree, then their correspondent default values must be included.
 default-attribute-selector-003	reference/ref-filled-green-100px-square	attribute selector - Default attribute values in DTDs		http://www.w3.org/TR/CSS21/selector.html#default-attrs,http://www.w3.org/TR/CSS21/selector.html#matching-attrs	9f891d5c9db9d28c99085a8ed0aae3f5eb97b327	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	Default attribute values may be declared in an external resource such as a DTD. In such case, the default attributes may or may not appear in the document tree. When default attributes appear in the document tree, then their correspondent default values must be included.
@@ -4998,22 +4999,22 @@ escaped-ident-spaces-004	reference/filler-text-below-green	Termination of escape
 escaped-ident-spaces-005	reference/filler-text-below-green	Termination of escaped character sequences with less than 6 digits and white space		http://www.w3.org/TR/CSS21/syndata.html#characters	f240c4f85400a64811558c3449adcc6d5bde2582	`Microsoft`<http://www.microsoft.com/>	Escaped character sequences are terminated by white space.
 escaped-ident-spaces-006	reference/filler-text-below-green	Termination of escaped character sequences with two digits terminated by white space		http://www.w3.org/TR/CSS21/syndata.html#characters	20509dc4fea583128da4f44c1426197b4f8180be	`Microsoft`<http://www.microsoft.com/>	Escaped character sequences (two hex digits) are terminated by white space.
 escaped-ident-spaces-007	reference/filler-text-below-green	Termination of escaped character sequences with less than six digits terminated by linefeeds and tabs		http://www.w3.org/TR/CSS21/syndata.html#characters	e5126ef7aba00fa9b87ca64194364c22d198cdd8	`Microsoft`<http://www.microsoft.com/>	Escaped character sequences (less than six hex digits) are terminated by white space, tabs and linefeeds.
-escaped-newline-001		Parsing strings with escaped newlines		http://www.w3.org/TR/CSS21/syndata.html#strings	a368ccece9c652696c5c144c1aa0fecb29927f9b	`Microsoft`<http://www.microsoft.com/>	Strings with escaped newlines are treated as a single whole string.
-escapes-000		Escaped Newline in String		http://www.w3.org/TR/CSS21/syndata.html#characters	950750c0a62615691fbccbe9817c3837801f1e5d	`L. David Baron`<http://dbaron.org/>	
-escapes-001		Escaped Quote Marks in String		http://www.w3.org/TR/CSS21/syndata.html#characters	d5ceb1f6427ee387f1149363c021778253f4af4b	`L. David Baron`<http://dbaron.org/>	
-escapes-002		Invalid Punctuation Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	19d446880071eac7f3a283faaa8b2be4ed6c00bb	`L. David Baron`<http://dbaron.org/>	
-escapes-003		Class and Keyword Letter Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	a44df61ff5ec58a376a57f02e7d5ec3f31e21097	`L. David Baron`<http://dbaron.org/>	
-escapes-004		Unicode Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	2044a1591ec93198c3629aba577bb6be3440f6f4	`L. David Baron`<http://dbaron.org/>	
-escapes-005		Unicode Escapes and Case Insensitivity		http://www.w3.org/TR/CSS21/syndata.html#characters	81d4490ba64d770fcfa0b8c5559791579bd828c6	`L. David Baron`<http://dbaron.org/>	
-escapes-006		Incorrect Letter Escape (Class Selector)		http://www.w3.org/TR/CSS21/syndata.html#characters	80c6ff44e60b689371740f7fba2f3e72eedb4f8f	`L. David Baron`<http://dbaron.org/>	
-escapes-007		Space-terminated Unicode Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	5ca266b170e970cc8ea0660566604f2e61902d8f	`L. David Baron`<http://dbaron.org/>	
-escapes-008		Invalid Space-terminated Character Escapes	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	3c8fc7a7952f1171c4eed730d7f5d1ba1216245a	`L. David Baron`<http://dbaron.org/>	
-escapes-009		Characters and case: Escaping a character inside a keyword	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	89b902b38bab3b08e1cb17ea3b6dca6723266935	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should be able to ignore the keyword
-escapes-010		Unicode-escaped Braces	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	1ddd0a4a4728e568964eca1de5d6352750123bbb	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Unicode escapes cannot substitute for '{' or '}' in CSS syntax.
-escapes-011		CSS Parsing: Escaped keywords		http://www.w3.org/TR/CSS21/syndata.html#rule-sets	975b36ea9fd479b417f9f0c4043060cdf8997cbc	`Ian Hickson`<mailto:ian@hixie.ch>	
-escapes-012		CSS Parsing: Escaped keywords		http://www.w3.org/TR/CSS21/syndata.html#characters	97948177ce7772c8da43f42ce82b4bf486d72246	`Ian Hickson`<mailto:ian@hixie.ch>	
-escapes-013		Escaping and spaces with classes		http://www.w3.org/TR/CSS21/syndata.html#rule-sets	1cbdd257d40a391f8f01042a67c39d5b7e035640	`Ian Hickson`<mailto:ian@hixie.ch>	
-escapes-014		Escaping and spaces with declarations		http://www.w3.org/TR/CSS21/syndata.html#rule-sets	ce2455f035a28eb71da0e971b3b040211ec1b035	`Ian Hickson`<mailto:ian@hixie.ch>	
+escaped-newline-001	reference/escaped-newline-001-ref	Parsing strings with escaped newlines		http://www.w3.org/TR/CSS21/syndata.html#strings	268c0cf7c468e19c41672de080ce0b8554d99e84	`Microsoft`<http://www.microsoft.com/>	Strings with escaped newlines are treated as a single whole string.
+escapes-000	reference/escapes-000-ref	Escaped Newline in String		http://www.w3.org/TR/CSS21/syndata.html#characters	0c9b15c13867af28ba7627b2147ee71e0a3e9728	`L. David Baron`<http://dbaron.org/>	
+escapes-001	reference/ref-green-background	Escaped Quote Marks in String		http://www.w3.org/TR/CSS21/syndata.html#characters	009f1fe3b2a45bba323a8e3e85adc84b62e956e1	`L. David Baron`<http://dbaron.org/>	
+escapes-002	reference/ref-green-background	Invalid Punctuation Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	748487bd6c6c4e64fd38c7d372301b12e286a946	`L. David Baron`<http://dbaron.org/>	
+escapes-003	reference/ref-green-background	Class and Keyword Letter Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	4ce7aa20feeec08352882fc93e323bc4ea23b460	`L. David Baron`<http://dbaron.org/>	
+escapes-004	reference/ref-green-background	Unicode Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	d4068fae5f1eb8df74c4f4a5005f32700e4fec7f	`L. David Baron`<http://dbaron.org/>	
+escapes-005	reference/ref-green-background	Unicode Escapes and Case Insensitivity		http://www.w3.org/TR/CSS21/syndata.html#characters	55ab91fc51ab6aeddd318eb651c0eb5f818edb4b	`L. David Baron`<http://dbaron.org/>	
+escapes-006	reference/ref-green-background	Incorrect Letter Escape (Class Selector)		http://www.w3.org/TR/CSS21/syndata.html#characters	b44fb0e8f34dc4862cb13c99a3237003f45126b8	`L. David Baron`<http://dbaron.org/>	
+escapes-007	reference/ref-green-background	Space-terminated Unicode Escapes		http://www.w3.org/TR/CSS21/syndata.html#characters	f7a619dd23a75b066c0c84163df4c9c44b869f56	`L. David Baron`<http://dbaron.org/>	
+escapes-008	reference/ref-green-background	Invalid Space-terminated Character Escapes	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	51e676c8a404d28237d4746f4332c5e856a47d6b	`L. David Baron`<http://dbaron.org/>	
+escapes-009	reference/ref-this-text-should-be-green	Characters and case: Escaping a character inside a keyword	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	ba720024df5d6762fd2a214abc52a6d7072c3522	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Browsers should be able to ignore the keyword
+escapes-010	reference/ref-this-text-should-be-green	Unicode-escaped Braces	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	73281d5ae3869cd1c4f2bc56b79490fc4dbef993	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	Unicode escapes cannot substitute for '{' or '}' in CSS syntax.
+escapes-011	reference/ref-this-text-should-be-green	CSS Parsing: Escaped keywords		http://www.w3.org/TR/CSS21/syndata.html#rule-sets	7380a6e19656ccb8da7a2901d8574eb4b33e18e1	`Ian Hickson`<mailto:ian@hixie.ch>	
+escapes-012	reference/ref-this-text-should-be-green	CSS Parsing: Escaped keywords		http://www.w3.org/TR/CSS21/syndata.html#characters	aaa1df5a039befac89a20dfa17fc331c1152071d	`Ian Hickson`<mailto:ian@hixie.ch>	
+escapes-013	reference/escapes-013-ref	Escaping and spaces with classes		http://www.w3.org/TR/CSS21/syndata.html#rule-sets	209146dd1aa589b1783449b32d3a11d533042cc4	`Ian Hickson`<mailto:ian@hixie.ch>	
+escapes-014	reference/ref-green-background	Escaping and spaces with declarations		http://www.w3.org/TR/CSS21/syndata.html#rule-sets	6f22915c4033d70149cb9fe614e2b4faf8f8ec96	`Ian Hickson`<mailto:ian@hixie.ch>	
 escapes-015	reference/ref-if-there-is-no-red	Escape of non-printable characters within declarations, applying to property values	invalid	http://www.w3.org/TR/CSS21/syndata.html#rule-sets	bb02c8dd729b3f9f049efe308d7b4919ff5ce68d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	red is a reserved (color name) keyword while red\9 is not a reserved keyword. red\9 is made of red with an escaped horizontal tab. That is why the parsing of the declaration should fail. Same thing with the other 23 tests (see test escapes-016).
 escapes-016	reference/ref-if-there-is-no-red	Escape of non-printable characters within declarations, applying to property values	invalid	http://www.w3.org/TR/CSS21/syndata.html#rule-sets	b0598aa61a40521b50a1affc0d0aad59ec12a8fe	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	red is a reserved (color name) keyword while red\9 is not a reserved keyword. red\9 is made of red with an escaped horizontal tab. That is why the parsing of the declaration should fail. Same thing with the other 23 tests (see test escapes-015).
 events-006		transitionend event for pseudo elements	dom,script	http://www.w3.org/TR/css3-transitions/#transition-events,http://www.w3.org/TR/CSS21/generate.html#before-after-content,http://www.w3.org/TR/css3-content/	8f08a369570e84a89e5aa2c51b27fe7a7cd5628a	`Rodney Rehm`<http://rodneyrehm.de/en/>	Test checks that TransitionEnd events are fired for pseudo-elements
@@ -5532,7 +5533,7 @@ first-page-selectors-002		Page Selectors - First Page in RTL	paged	http://www.w3
 first-page-selectors-003		Page Selectors - First Page in LTR Forced :left	may,paged	http://www.w3.org/TR/CSS21/page.html#page-selectors	08f613e061ab08c5a071a50d2c7e37dddb914254	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The first page of a left-to-right document can be forced as :left by inserting a page break.
 first-page-selectors-004		Page Selectors - First Page in RTL Forced :right	may,paged	http://www.w3.org/TR/CSS21/page.html#page-selectors	a5c1fb528f5b5f17a57c65056d00504d3813cbef	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The first page of a right-to-left document can be forced as :right by inserting a page break.
 first-page-vlr-003		first page of a document with vertical-lr writing-mode	paged	http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/CSS21/page.html#page-selectors	ba9f62a92fda53555211ee1de1a17cb08e124dd6	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is left-to-right. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-lr' is the :right page.
-first-page-vrl-002		first page of a document with vertical-rl writing-mode	image,paged	http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/CSS21/page.html#page-selectors	0e3999276064df4aff359983d7a6cb2977a7a19b	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page.
+first-page-vrl-002		first page of a document with vertical-rl writing-mode	image,paged	http://www.w3.org/TR/css-writing-modes-3/#writing-mode,http://www.w3.org/TR/CSS21/page.html#page-selectors	d889dab856e4fad4d820153f78921a043b28589d	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page.
 fixed-table-layout-001		Fixed table layout when 'width' property is 'auto'	ahem	http://www.w3.org/TR/CSS21/tables.html#fixed-table-layout	72b5ea78d6b5c107cbee06057efd23f277284710	`Microsoft`<http://www.microsoft.com/>	If a browser supports fixed table layout when 'width' is 'auto', a table will size to its containing block, minus any margin space (modified example from spec section 17.5.2.1).
 fixed-table-layout-002		Value other than 'auto' for column width sets width of cells in the column		http://www.w3.org/TR/CSS21/tables.html#fixed-table-layout	ec1814f346b834600c51b0b4ca6b0b761d13ba96	`Microsoft`<http://www.microsoft.com/>	A column element with a value other than 'auto' for the 'width' property sets the width for the column of cells it contains.
 fixed-table-layout-002a	reference/fixed-table-layout-002a-ref	table-layout: fixed - specified column width must include padding and border applied on its cells	image	http://www.w3.org/TR/CSS21/tables.html#fixed-table-layout	378167322628bd5e55fd6ed930bd1224f26fa8f1	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	In the fixed table layout algorithm, the horizontal layout of the table only depends on the table's width, the width of the columns, table borders and any non-zero horizontal border-spacing if 'border-collapse: separate' applies to such table, like in this test. The specified width of columns must include the non-zero horizontal padding and/or non-zero horizontal borders which may be applying to the cells contained in such columns.
@@ -5907,10 +5908,10 @@ font-family-applies-to-016	reference/ref-if-there-is-no-red	Font-family and 'dis
 font-family-applies-to-017	reference/font-family-applies-to-001-ref	Font-family and 'display: inherit' elements	ahem	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	734651906fb3bf28776c9a9acf53bf5acd5714be	`Microsoft`<http://www.microsoft.com/>	The 'font-family' property applies to 'display: inherit' elements.
 font-family-invalid-characters-001	reference/font-family-invalid-characters-001-ref	Invalid characters in font-family values	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	449eb0f3295627f65a6386400d771ca86f454c6c	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names invalidate entire declaration.
 font-family-invalid-characters-002	reference/font-family-invalid-characters-002-ref	Invalid parenthesis and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	3d59693705c06a2105e9c32be950462108394a47	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-003		Invalid curly brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	836b64a69397022366fd721fcab1aedbd869340c	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-004		Invalid square brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	81c2353fba8bbbb408acbc6272951d9a22e9d0b5	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-005		Invalid quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	e8cd099e08c9e29876015789d990e1a41126c7c7	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
-font-family-invalid-characters-006		Invalid single quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	cbf2d4c8d6741038958506728525039b584cedf9	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-003	reference/font-family-invalid-characters-002-ref	Invalid curly brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	f97a9ef862be0c3008aa6684956be102012953d3	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-004	reference/font-family-invalid-characters-002-ref	Invalid square brackets and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	fe90154e0074f886663b9b9e7a8ae3d0fcb536f2	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-005	reference/font-family-invalid-characters-005-ref	Invalid quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	5024d4008e25d8c9bdc41fbe60ee41040d4f6819	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
+font-family-invalid-characters-006	reference/font-family-invalid-characters-006-ref	Invalid single quotes and pair matching	ahem,invalid	http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/css-fonts-3/#font-family-prop	825885808c4250ef0babc9fed4f49577e8b7de20	`Microsoft`<http://www.microsoft.com/>,`Arron Eicholz`<http://www.microsoft.com/>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Invalid characters in font family names.
 font-family-name-001	reference/font-family-name-ref	font family name with no quotes	font	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	7b14f6d140576152871525a8f532383679e60e50	`Mozilla`<http://www.mozilla.com/>	The 'font-family' property set to and installed font renders the appropriate font. Family name with no quotes.
 font-family-name-002	reference/font-family-name-ref	font family name with no quotes, lowercase	font	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	4d882507a40bb4db9fd5acc74fc6b725e7053ef8	`Mozilla`<http://www.mozilla.com/>	The 'font-family' property set to and installed font renders the appropriate font. Family name with no quotes, lowercase.
 font-family-name-003	reference/font-family-name-ref	font family name with no quotes, mixed case	font	http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family,http://www.w3.org/TR/CSS21/fonts.html#font-family-prop,http://www.w3.org/TR/css-fonts-3/#font-family-prop	bf19d1e16a163cc0db548a07af065b1d40895864	`Mozilla`<http://www.mozilla.com/>	The 'font-family' property set to and installed font renders the appropriate font. Family name with no quotes, mixed case.
@@ -6323,27 +6324,27 @@ id-selector-002		ID selector syntax - Begins with hyphen		http://www.w3.org/TR/C
 id-selector-004	reference/no-red-filler-text-ref	Invalid ID selector syntax - white space between # and id	invalid	http://www.w3.org/TR/CSS21/selector.html#id-selectors	7459386103b7a6c9db4af7f650d624a9151af0ec	`Microsoft`<http://www.microsoft.com/>	White space is not allowed between # and identifier for selector.
 id-selector-005	reference/no-red-filler-text-ref	Invalid ID selector syntax - Begins with numerals	invalid	http://www.w3.org/TR/CSS21/selector.html#id-selectors	1bd9f836f45d52bafde0199eff7f47086d979f72	`Microsoft`<http://www.microsoft.com/>	Identifier selectors are invalid if it begins with a numeral.
 id-selector-006	reference/filler-text-below-green	Simple ID selectors specificity over attribute selectors		http://www.w3.org/TR/CSS21/selector.html#id-selectors	fd8cd5725804469be3f3dc5b1f80830a4c700a9c	`Microsoft`<http://www.microsoft.com/>	ID selectors trump attribute selectors in specificity.
-ident-000		Valid Identifiers (a-z) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	dcae4e85d912de68a032922c5c66ee3b5d5b0523	`L. David Baron`<http://dbaron.org/>	
-ident-001		Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	745ae4e09f214376e2beb7fbe9ffd7233023a549	`L. David Baron`<http://dbaron.org/>	
-ident-002		Valid Identifiers (starting with _) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	8701e48995c2348341a2c9e877f99b7a66089e05	`L. David Baron`<http://dbaron.org/>	
-ident-003		Valid Identifiers (starting with -) as Classes and IDs	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	e13774e8d08acd5dc9b28321c8e601d6a843dfcc	`L. David Baron`<http://dbaron.org/>,`Ray Kiddy`<mailto:ray@ganymede.org>	
-ident-004		Valid Identifiers (starting with ideographic) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	5ccdee8f236f708b5e153fc722770b7a2524353d	`L. David Baron`<http://dbaron.org/>	
-ident-005		Valid Identifiers (including ideographic) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	1565aad55801206cd10f882d59ad4de53bb703dc	`L. David Baron`<http://dbaron.org/>	
-ident-006		Valid Identifiers (starting with escape) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	f407a0a4ac737b97e811063ca0a114e293c0eba6	`L. David Baron`<http://dbaron.org/>	
-ident-007		Valid Identifiers (including escape) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	c3f5dae0988bdfa89f232ccc132fc2c2aa82b43c	`L. David Baron`<http://dbaron.org/>	
-ident-008		Invalid Identifiers (starting with digit) as Classes and IDs	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	0142dd6870b7bba63fc29d0ace1c873d37ac89c1	`L. David Baron`<http://dbaron.org/>	
-ident-009		Valid Identifiers (including digits) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	19c2292cecce556dc053fa482ed4a28e0b279822	`L. David Baron`<http://dbaron.org/>	
-ident-010		Valid Identifiers (starting with escape) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	8f9b399208d344879a35f609e714c031593ee10d	`L. David Baron`<http://dbaron.org/>	
-ident-011		Valid Identifiers (including escapes) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	de2d4d2391df6b8948fc735dc227bd773e3942d1	`L. David Baron`<http://dbaron.org/>	
-ident-012		Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	fa3a2f65c5b23a08e8b6ae17c4c29ec28b32f1b8	`L. David Baron`<http://dbaron.org/>	
-ident-013		Valid Identifiers (starting with escaped -) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	c7ec0a330fc58da86312c1d38ca96371991965c5	`L. David Baron`<http://dbaron.org/>	
+ident-000	reference/ident-000-ref	Valid Identifiers (a-z) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	a5bb017aac09549e58259b2eeb0d3eb04f49c485	`L. David Baron`<http://dbaron.org/>	
+ident-001	reference/ident-000-ref	Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	d3a3583374a41cfea69171d7a73d7f9ab446502a	`L. David Baron`<http://dbaron.org/>	
+ident-002	reference/ident-000-ref	Valid Identifiers (starting with _) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	a0f1d3ed5a31e6c16f0b724778057e1915af7811	`L. David Baron`<http://dbaron.org/>	
+ident-003	reference/ident-000-ref	Valid Identifiers (starting with -) as Classes and IDs	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	575ca9e2213998b097eeb5e85b18dbd7f9bd2559	`L. David Baron`<http://dbaron.org/>,`Ray Kiddy`<mailto:ray@ganymede.org>	
+ident-004	reference/ident-000-ref	Valid Identifiers (starting with ideographic) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	110a73bc1583318423eaf2a493185233abccd705	`L. David Baron`<http://dbaron.org/>	
+ident-005	reference/ident-000-ref	Valid Identifiers (including ideographic) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	edb839271da978d74b592b2942a84fc0c4fbc24e	`L. David Baron`<http://dbaron.org/>	
+ident-006	reference/ident-000-ref	Valid Identifiers (starting with escape) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	28b396799100707a2ea898d34d5033f5e14e47a4	`L. David Baron`<http://dbaron.org/>	
+ident-007	reference/ident-000-ref	Valid Identifiers (including escape) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	09f023333c98f8a6709cd99f90f7a45fa271202a	`L. David Baron`<http://dbaron.org/>	
+ident-008	reference/ident-000-ref	Invalid Identifiers (starting with digit) as Classes and IDs	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	42583189992d7bbd39af2647d717d5d1a1d8d31b	`L. David Baron`<http://dbaron.org/>	
+ident-009	reference/ident-000-ref	Valid Identifiers (including digits) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	92f0fc52bb856d3e73bc6926f6d889ff6c1aae96	`L. David Baron`<http://dbaron.org/>	
+ident-010	reference/ident-000-ref	Valid Identifiers (starting with escape) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	da0270119dd4eb6a3460d7ff6d020188f6921693	`L. David Baron`<http://dbaron.org/>	
+ident-011	reference/ident-000-ref	Valid Identifiers (including escapes) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	1ca29775a384976a67f7fcc7af1eb44db370f38f	`L. David Baron`<http://dbaron.org/>	
+ident-012	reference/ident-012-ref	Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	ae7afb4f1969ab07e5ec9342400d47c5e43e126c	`L. David Baron`<http://dbaron.org/>	
+ident-013	reference/ident-000-ref	Valid Identifiers (starting with escaped -) as Classes and IDs		http://www.w3.org/TR/CSS21/syndata.html#characters	f94b46735cf5432ef144c6a8763cea18c8dce62c	`L. David Baron`<http://dbaron.org/>	
 ident-014	reference/filler-text-below-green	Selector attributes and hyphens		http://www.w3.org/TR/CSS21/syndata.html	7bd28b7622cdea65b4f7f5bf91064098f9f4e7fd	`Microsoft`<http://www.microsoft.com/>	Attribute selectors can begin with hyphens.
 ident-015	reference/filler-text-below-green	Attribute selectors and underscores		http://www.w3.org/TR/CSS21/syndata.html	a1137fa2d4ed1ae9e4911a24424ce267ab15bd88	`Microsoft`<http://www.microsoft.com/>	Attribute selectors can begin with underscores.
 ident-016	reference/filler-text-below-green	Attribute selectors with hyphens and underscores		http://www.w3.org/TR/CSS21/syndata.html	f4acea7aa665c9f55d3f5a1da108e96f10ecdf59	`Microsoft`<http://www.microsoft.com/>	Attribute selectors are valid if they begin with hyphens and then underscores.
 ident-017	reference/no-red-filler-text-ref	Attribute selection with digits	invalid	http://www.w3.org/TR/CSS21/syndata.html	592ab0660fdfcecc6a118cbb31931670a89c05ba	`Microsoft`<http://www.microsoft.com/>	Attribute selectors cannot begin with digits.
 ident-018	reference/no-red-filler-text-ref	Attribute selectors starting with hyphens and digits	invalid	http://www.w3.org/TR/CSS21/syndata.html	02a41a155963221822aee765d06bde083016e86a	`Microsoft`<http://www.microsoft.com/>	Attribute selectors cannot begin with hyphens then digits.
 ident-019	reference/filler-text-below-green	Attribute selectors starting with underscore and digits		http://www.w3.org/TR/CSS21/syndata.html	f9a74db3a0d526452c719fab4a5c63c613307c7f	`Microsoft`<http://www.microsoft.com/>	Attribute selectors can begin with underscore then digits.
-ident-020		Invalid Identifiers (starting with double -) as Classes and IDs	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	7951aa45f6a7be3d5e62dabc08f352946fbb21c0	`L. David Baron`<http://dbaron.org/>	
+ident-020	reference/ident-000-ref	Invalid Identifiers (starting with double -) as Classes and IDs	invalid	http://www.w3.org/TR/CSS21/syndata.html#characters	6d6e06fe5ec1a32266d1281c625dce2125ec208e	`L. David Baron`<http://dbaron.org/>	
 ignored-rules-001	reference/filler-text-below-green	Parsing invalid rules that precede good rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#declaration	0b866d1222cf23f35f26d238726d15273fcc1eff	`Microsoft`<http://www.microsoft.com/>	Bad rules are ignored while following good rules are applied.
 ignored-rules-002	reference/filler-text-below-green	Parsing invalid rules that follow good rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#declaration	7dfe293b2660f3fbc2de570da2c3088b70bbee58	`Microsoft`<http://www.microsoft.com/>	Good rules are applied while following bad rules are ignored.
 ignored-rules-003	reference/filler-text-below-green	Parsing invalid values	invalid	http://www.w3.org/TR/CSS21/syndata.html#declaration	9d9b1bd28dd653aadbe1f5eebec01c9c2d8a41cb	`Microsoft`<http://www.microsoft.com/>	Invalid values are ignored while valid properties are applied.
@@ -6351,8 +6352,8 @@ ignored-rules-004	reference/filler-text-below-green	Parsing invalid values with
 ignored-rules-005	reference/filler-text-below-green	Parsing invalid values that start with a valid value name	invalid	http://www.w3.org/TR/CSS21/syndata.html#declaration	c352831db92f0062af9bc8d94d7a18cfd75dd6ad	`Microsoft`<http://www.microsoft.com/>	Invalid values that begin with a valid keyword are ignored while valid properties are applied.
 ignored-rules-006	reference/filler-text-below-green	Parsing invalid values with slashes	invalid	http://www.w3.org/TR/CSS21/syndata.html#declaration	196120bb28d7e792e8fcf7c9031b247572463ea1	`Microsoft`<http://www.microsoft.com/>	Invalid values with slashes are ignored while valid properties are applied.
 ignored-rules-007	reference/filler-text-below-green	Parsing invalid values that are functions	invalid	http://www.w3.org/TR/CSS21/syndata.html#declaration	b590bc0c33459102d1126ee05a71d93f2f827f77	`Microsoft`<http://www.microsoft.com/>	Invalid values that are functions are ignored while valid properties are applied.
-import-000		At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	99ff37ee72125d91c011488bddee11c6bc89f86b	`L. David Baron`<http://dbaron.org/>	
-import-001		At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	5f00643723cdda27a0cfd53cf73f2f8ac606dfad	`L. David Baron`<http://dbaron.org/>	
+import-000	reference/ref-this-text-should-be-green	At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	56ed95eb4f2eb7c3e86f1a5dc454fa17a3fbb3db	`L. David Baron`<http://dbaron.org/>	
+import-001	reference/ref-this-text-should-be-green	At-rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#at-rules	1e5637c6ea1964529b035f164d6961b50d3bf09a	`L. David Baron`<http://dbaron.org/>	
 increment-counter-001		Counter-increment before 'counter' use		http://www.w3.org/TR/CSS21/generate.html#content	74a28d6f4e346a5a00c255b34163b80b03353669	`Microsoft`<http://www.microsoft.com/>	A counter is used after an increment.
 inherit-001		Inherit keyword		http://www.w3.org/TR/CSS21/cascade.html#value-def-inherit	4435a6e6308b23056f4e1faadba15463a600ede0	`Microsoft`<http://www.microsoft.com/>	Children elements inherit the parents color given the 'inherit' keyword.
 inherit-002		Inherit on non-inherited properties		http://www.w3.org/TR/CSS21/cascade.html#value-def-inherit	e81869398e567fd1d7c84f02920d38e419c1d774	`Microsoft`<http://www.microsoft.com/>	Inherit can be used on properties which are not normally inherited.
@@ -6542,8 +6543,8 @@ insert-inline-in-blocks-n-inlines-middle-003	reference/insert-inline-in-blocks-n
 invalid-at-rule-001	reference/no-red-filler-text-ref	Parser error handling with invalid at-rules: @ invalid selector invalidates entire block	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	e74e756303a0ea10063876b0e915c1de7de7ffc4	`Microsoft`<http://www.microsoft.com/>	The entire block of an invalid at-rule is ignored.
 invalid-decl-at-rule-001	reference/filler-text-below-green	Parsing invalid declarations in at-rules where valid declaration precedes an invalid rule	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	efb9d55d7f93952ef508ec660f572397fdcececd	`Microsoft`<http://www.microsoft.com/>	Invalid declarations at the end of at-rules are ignored while the remaining preceding valid declarations are applied.
 invalid-decl-at-rule-002	reference/filler-text-below-green	Parsing invalid declarations in at-rules where valid declaration follows invalid rule	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	18333853d45725f63cfc9ac8c77ccf8019fbd6a0	`Microsoft`<http://www.microsoft.com/>	Invalid declarations at the beginning of at-rules are ignored while the remaining following valid declarations are applied.
-keywords-000		Keywords v. Strings (background)		http://www.w3.org/TR/CSS21/syndata.html#keywords	d5397cb7d5a72715ad50c65efa8fbfa4d8552c6d	`L. David Baron`<http://dbaron.org/>	
-keywords-001		Keywords v. Strings (width)		http://www.w3.org/TR/CSS21/syndata.html#keywords	ebc0dd14fa063fa86bbbd873b76579db593bb1b6	`L. David Baron`<http://dbaron.org/>	
+keywords-000	reference/ref-green-background	Keywords v. Strings (background)		http://www.w3.org/TR/CSS21/syndata.html#keywords	357b9fbfad6de9a3954d1b74132546939b2ab969	`L. David Baron`<http://dbaron.org/>	
+keywords-001	reference/keywords-001-ref	Keywords v. Strings (width)		http://www.w3.org/TR/CSS21/syndata.html#keywords	13c37f2ae37cf36c4c63e048fda5b7e634131c79	`L. David Baron`<http://dbaron.org/>	
 lang-pseudoclass-001		:lang pseudoclass	HTMLonly	http://www.w3.org/TR/CSS21/selector.html#lang	8c18cfa29028ff4f8dc0f6c8bbcb47aa62b41176	`Richard Ishida`<mailto:ishida@w3.org>,`Eira Monstad, Opera Software ASA`<mailto:public-testsuites@opera.com>	:lang pseudoclass in HTML should not be case-sensitive, and match a substring
 lang-pseudoclass-002		:lang pseudoclass	nonHTML	http://www.w3.org/TR/CSS21/selector.html#lang	7ff7a233c03f8673acf91b885456e645211ffc3d	`Richard Ishida`<mailto:ishida@w3.org>,`Eira Monstad, Opera Software ASA`<mailto:public-testsuites@opera.com>	:lang pseudoclass in XHTML should be case sensitive, and match a substring
 lang-selector-001		Selectors :lang pseudo-class		http://www.w3.org/TR/CSS21/selector.html#lang	c62deff2754cdf81bc55ed4873786125c1378759	`Microsoft`<http://www.microsoft.com/>	The :lang pseudo-class selector matches any element with a matching lang attribute.
@@ -6818,7 +6819,7 @@ list-style-016		List-style inheriting a single value		http://www.w3.org/TR/CSS21
 list-style-017		List-style inheriting two values		http://www.w3.org/TR/CSS21/generate.html#propdef-list-style,http://www.w3.org/TR/CSS21/generate.html#list-style	d5bd3c481f5952d5dc7a6a2a3eafd1696355e1f3	`Microsoft`<http://www.microsoft.com/>	The shorthand property 'list-style' set to 'inherit' inherits two values from the parent.
 list-style-018		List-style inheriting three values		http://www.w3.org/TR/CSS21/generate.html#propdef-list-style,http://www.w3.org/TR/CSS21/generate.html#list-style	7e422e3ef292376e90e5192bcd3295353e942f14	`Microsoft`<http://www.microsoft.com/>	The shorthand property 'list-style' set to 'inherit' inherits three values from the parent.
 list-style-019	reference/list-style-019-ref	list-style - initial value	image	http://www.w3.org/TR/CSS21/generate.html#list-style,http://www.w3.org/TR/CSS21/about.html#shorthand,http://www.w3.org/TR/CSS21/cascade.html#specified-value	8de761b8a29f13d33dc7c01ae235ac946a520245	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>,`James Hopkins`<james(a)idreamincode.co.uk>	'list-style' property is a shorthand notation that sets the three properties 'list-style-type', 'list-style-image' and 'list-style-position'. If one of the 3 list-style properties is not specified explicitly, then such 'list-style' property is assigned its initial value as indicated in its property definition.
-list-style-020		'list-style' shorthand and 'none' values		http://www.w3.org/TR/CSS21/syndata.html#tokenization	792ef31f35f133e75c2b906a2b5ddbda8be7b7bd	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	
+list-style-020	reference/list-style-020-ref	'list-style' shorthand and 'none' values		http://www.w3.org/TR/CSS21/syndata.html#tokenization	7d2ccfdc51e1c488c3a51f2cabd19c744470329b	`Elika J. Etemad`<http://fantasai.inkedblade.net/>	
 list-style-021	reference/list-style-021-ref	list-style: none - followed by a list-style-image reset	image	http://www.w3.org/TR/CSS21/generate.html#list-style,http://www.w3.org/TR/CSS21/cascade.html#cascading-order	ba85cbb037f474a7e9333ebab0599d4b2750acdd	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	A value of 'none' for the 'list-style' property sets both 'list-style-type' and 'list-style-image' to 'none'. If two declarations have the same weight, origin and specificity, then the latter specified wins.
 list-style-applies-to-001		List-style applied to elements with 'display' set to 'table-row-group'		http://www.w3.org/TR/CSS21/generate.html#propdef-list-style,http://www.w3.org/TR/CSS21/generate.html#list-style	a5a72e9c84e14d48ac4381d63cdd1b55d30eb1c9	`Microsoft`<http://www.microsoft.com/>	The 'list-style' property applies to elements with 'display' set to 'table-row-group'.
 list-style-applies-to-002		List-style applied to elements with 'display' set to 'table-header-group'		http://www.w3.org/TR/CSS21/generate.html#propdef-list-style,http://www.w3.org/TR/CSS21/generate.html#list-style	b034697185c3f78d127535752e78122edf2e4612	`Microsoft`<http://www.microsoft.com/>	The 'list-style' property applies to elements with 'display' set to 'table-header-group'.
@@ -7368,9 +7369,9 @@ margin-top-applies-to-013	reference/margin-top-applies-to-013-ref	Margin-top app
 margin-top-applies-to-014	reference/margin-top-applies-to-013-ref	Margin-top applied to element with display inline-table		http://www.w3.org/TR/CSS21/box.html#propdef-margin-top,http://www.w3.org/TR/CSS21/box.html#margin-properties	7a308efdfa0db0a8f0542ca975b2bb3abb1b549b	`Microsoft`<http://www.microsoft.com/>	The 'margin-top' property applies to elements with a display of inline-table.
 margin-top-applies-to-015	reference/margin-top-applies-to-013-ref	Margin-top applied to element with display table-caption		http://www.w3.org/TR/CSS21/box.html#propdef-margin-top,http://www.w3.org/TR/CSS21/box.html#margin-properties	1bf6a218fa8d325b9a55d0166f933420622dcbeb	`Microsoft`<http://www.microsoft.com/>	The 'margin-top' property applies to elements with a display of table-caption.
 markers-rtl-001		List marker in right-to-left layout		http://www.w3.org/TR/CSS21/generate.html#lists	93a5ddaefbdba92fba785f4dcd9a7dc1c1eec4a5	`Microsoft`<http://www.microsoft.com/>	When the 'direction' property is set to 'RTL' the markers for list items are placed on the right.
-matching-brackets-001		Matching brackets and quotes for @rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	facae6b02dfba602e9064b68b5e163c8a1c76cd9	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must handle unexpected tokens encountered while parsing an at-rule by reading until the end of the statement, while observing the rules for matching pairs of brackets and quotes, and correctly handling escapes.
-matching-brackets-002		Matching brackets and quotes for declarations	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	ce3d692e67e7ca12b7bfadde6e12af19092390a4	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must handle unexpected tokens encountered while parsing a declaration by reading until the end of the statement, while observing the rules for matching pairs of brackets and quotes, and correctly handling escapes.
-matching-brackets-003		Matching brackets and quotes for selectors	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	df372c5402e2d0793db596947c5157448aee677d	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must handle unexpected tokens encountered while parsing a declaration by reading until the end of the statement, while observing the rules for matching pairs of brackets and quotes, and correctly handling escapes.
+matching-brackets-001	reference/matching-brackets-001-ref	Matching brackets and quotes for @rules	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	5c561bfd8523fa69b41b5bde8bab391d9af7695b	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must handle unexpected tokens encountered while parsing an at-rule by reading until the end of the statement, while observing the rules for matching pairs of brackets and quotes, and correctly handling escapes.
+matching-brackets-002	reference/matching-brackets-002-ref	Matching brackets and quotes for declarations	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	40aa7c8bdb4c8f5be2697718e89a9de4ec34b771	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must handle unexpected tokens encountered while parsing a declaration by reading until the end of the statement, while observing the rules for matching pairs of brackets and quotes, and correctly handling escapes.
+matching-brackets-003	reference/matching-brackets-001-ref	Matching brackets and quotes for selectors	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors,http://www.w3.org/TR/CSS21/media.html#at-media-rule	1f08f3cd0afdd687abfc93a66d1d139b90906e8b	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must handle unexpected tokens encountered while parsing a declaration by reading until the end of the statement, while observing the rules for matching pairs of brackets and quotes, and correctly handling escapes.
 max-height-001	reference/ref-filled-black-96px-square	Max-height using pixels with a minimum minus one value, -1px	invalid	http://www.w3.org/TR/CSS21/visudet.html#propdef-max-height,http://www.w3.org/TR/CSS21/visudet.html#min-max-heights	2bd8cdd11cef083ddeec6f37cf73b655577f0c5c	`Microsoft`<http://www.microsoft.com/>	The 'max-height' property sets a minimum minus one length value in pixels.
 max-height-002	reference/height-001-ref	Max-height using pixels with a minimum value, 0px		http://www.w3.org/TR/CSS21/visudet.html#propdef-max-height,http://www.w3.org/TR/CSS21/visudet.html#min-max-heights	34f58e49e33d41ab4de3703b07f0f4ec91a67d8d	`Microsoft`<http://www.microsoft.com/>	The 'max-height' property sets a minimum length value in pixels.
 max-height-003	reference/height-003-ref	Max-height using pixels with a minimum plus one value, 1px		http://www.w3.org/TR/CSS21/visudet.html#propdef-max-height,http://www.w3.org/TR/CSS21/visudet.html#min-max-heights	d31f0a0ba68e8ceb02d5eb7b33e06c7b8c23669e	`Microsoft`<http://www.microsoft.com/>	The 'max-height' property sets a minimum plus one length value in pixels.
@@ -7804,21 +7805,21 @@ non-inherited-value-001		Non-inherited values		http://www.w3.org/TR/CSS21/cascad
 numbers-units-001	reference/no-red-on-blank-page-ref	Parsing invalid numbers - alphanumeric characters	invalid	http://www.w3.org/TR/CSS21/syndata.html#numbers	1b0b7ceefb766eb7fea46e6c000340c2f790396a	`Microsoft`<http://www.microsoft.com/>	An integer cannot have alphanumeric characters within it.
 numbers-units-002		Parsing decimal values - decimal with multiple decimal digits		http://www.w3.org/TR/CSS21/syndata.html#numbers	42b2756b7ca2b27dafa3013671505e81c6d37d7c	`Microsoft`<http://www.microsoft.com/>	A number can be zero or more digits followed by a dot (.) followed by multiple digits.
 numbers-units-003	reference/no-red-on-blank-page-ref	Parsing invalid decimal values - alphanumeric characters within number	invalid	http://www.w3.org/TR/CSS21/syndata.html#numbers	8a8960ac1523a63abbc10e9b248d8b0c82ed77c0	`Microsoft`<http://www.microsoft.com/>	An alphanumeric character cannot be within the number value.
-numbers-units-004		Parsing integer numbers with '+'		http://www.w3.org/TR/CSS21/syndata.html#numbers	561dac2f8f4e459b6f4c9930d1fee532608ceb97	`Microsoft`<http://www.microsoft.com/>	Integers can be preceded by '+'.
+numbers-units-004	reference/ref-filled-black-96px-square	Parsing integer numbers with '+'		http://www.w3.org/TR/CSS21/syndata.html#numbers	74ad99000f507e14fe02517ad0b9e02d1ecc5d29	`Microsoft`<http://www.microsoft.com/>	Integers can be preceded by '+'.
 numbers-units-005	reference/no-red-on-blank-page-ref	Optional unit identifier after 0		http://www.w3.org/TR/CSS21/syndata.html#length-units	e14faa0e3573ee2ca5c0d46f6850551029ae4498	`Microsoft`<http://www.microsoft.com/>	After a zero length, the unit identifier is not necessary.
-numbers-units-006		Unsupported negative values	invalid	http://www.w3.org/TR/CSS21/syndata.html#length-units	e75352dbfd47da1233ede4c4ac9a41ed89435167	`Microsoft`<http://www.microsoft.com/>	If a negative length value is set on a property that does not allow negative length values, the declaration is ignored.
-numbers-units-007		Em sizes	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	8945a06e794fd09f93f975f1142f06fed6b4d1fb	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (default) of the element on which it is used.
-numbers-units-009		Em size with the font-size set to px size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	3eb2cc524bdf7a01643f112b0df58344409d4109	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (pixels) of the element on which it is used.
-numbers-units-010		Em size with font-size set to inch	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	544216b4b754c48bd39f163335c74ca642d05b48	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (inches) of the element on which it is used.
-numbers-units-011		Em size with font-size set to em	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	ec6b808f8e09eb797259c392b97f010d84fcb3e5	`Microsoft`<http://www.microsoft.com/>	When 'em' is assigned in the value of the 'font-size' property itself, it uses the font size of the parent element.
-numbers-units-012		Em size with font-size set to ex	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	17debc5471710d3a82f442d162e780ead7b8312a	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (ex) of the element on which it is used.
-numbers-units-013		Em size with font-size set to percentage	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	635cdfff1b2b432295ca89402ef6ce959c2aba8f	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property of the element on which it is used.
-numbers-units-015		Height of EX	ahem,should	http://www.w3.org/TR/CSS21/syndata.html#length-units	2ba0616dabff5103226fc04ff804bb894ba4c7c0	`Microsoft`<http://www.microsoft.com/>	In the cases where it is impossible or impractical to determine the x-height, a value of 0.5em should be used.
+numbers-units-006	reference/ref-filled-black-96px-square	Unsupported negative values	invalid	http://www.w3.org/TR/CSS21/syndata.html#length-units	64c733740dc0c5e05af6a6592304ad3b55b5daca	`Microsoft`<http://www.microsoft.com/>	If a negative length value is set on a property that does not allow negative length values, the declaration is ignored.
+numbers-units-007	reference/numbers-units-007-ref	Em sizes	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	3dfe4a5dae6eb7697fce00966df2834f4d87359c	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (default) of the element on which it is used.
+numbers-units-009	reference/numbers-units-009-ref	Em size with the font-size set to px size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	513eadb8bcc8563ffcc31990bcdb8f0750d1ee79	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (pixels) of the element on which it is used.
+numbers-units-010	reference/numbers-units-010-ref	Em size with font-size set to inch	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	1b0c3441b793346461c26bc4fdd3138e0eaf38d0	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (inches) of the element on which it is used.
+numbers-units-011	reference/numbers-units-011-ref	Em size with font-size set to em	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	aa2ebfbe2bd7e9a7238771e4c9ce84c5f1b20655	`Microsoft`<http://www.microsoft.com/>	When 'em' is assigned in the value of the 'font-size' property itself, it uses the font size of the parent element.
+numbers-units-012	reference/numbers-units-012-ref	Em size with font-size set to ex	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	2a34944648e55f05dd60e223acaf156c11ff87e5	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property (ex) of the element on which it is used.
+numbers-units-013	reference/numbers-units-013-ref	Em size with font-size set to percentage	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	201dd865ba3719a067cd7e298b15be5bbfe500c2	`Microsoft`<http://www.microsoft.com/>	The 'em' unit is equal to the computed value of the 'font-size' property of the element on which it is used.
+numbers-units-015	reference/numbers-units-014-ref-a;reference/numbers-units-014-ref-b	Height of EX	ahem,should	http://www.w3.org/TR/CSS21/syndata.html#length-units	cf44fc6d2f871deccf8b82446e048ce71328c531	`Microsoft`<http://www.microsoft.com/>	In the cases where it is impossible or impractical to determine the x-height, a value of 0.5em should be used.
 numbers-units-016	reference/no-red-on-blank-page-ref	Parsing invalid percentage values - decimal value with multiple decimals	invalid	http://www.w3.org/TR/CSS21/syndata.html#percentage-units	032197e595d43b318e71afaa18165c9b26897c6b	`Microsoft`<http://www.microsoft.com/>	Percentage assignments with more than one decimal are invalid.
 numbers-units-017	reference/no-red-on-blank-page-ref	Parsing of percentage values - 0%		http://www.w3.org/TR/CSS21/syndata.html#percentage-units	9fd21f8ef2ef2fe2b6f9fc6027dd2fa08b2fcf82	`Microsoft`<http://www.microsoft.com/>	Percentage of 0% is valid and calculates to 0.
-numbers-units-018		Specifying em/ex on the root element	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	34b295f627cee5fca0f107cabe86f8fce947c5ca	`Microsoft`<http://www.microsoft.com/>	Units 'em' and 'ex' refer to the initial value of the property when specified on the root element of a document.
-numbers-units-019		First available font defines the 'ex' unit size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	2dcf21ffc8cc97573b4d991139da27f4f716983d	`Microsoft`<http://www.microsoft.com/>	The 'ex' unit size is defined by the element's first available font.
-numbers-units-021		Root element and the 'em' unit size	96dpi,ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	9e80c62cfd5aa67f5fe3c33a26b0512476ea8bdc	`Microsoft`<http://www.microsoft.com/>	The 'em' unit refers to the property's initial value when specified on the root element.
+numbers-units-018	reference/numbers-units-018-ref	Specifying em/ex on the root element	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	be57984d07c22fde2d67254d12dc1ebfd64fda1b	`Microsoft`<http://www.microsoft.com/>	Units 'em' and 'ex' refer to the initial value of the property when specified on the root element of a document.
+numbers-units-019	reference/numbers-units-019-ref	First available font defines the 'ex' unit size	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	40d9cc6800e2f9fe3111f065d954088d3d2bb5a5	`Microsoft`<http://www.microsoft.com/>	The 'ex' unit size is defined by the element's first available font.
+numbers-units-021	reference/numbers-units-021-ref	Root element and the 'em' unit size	96dpi,ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	a6149985d390df6ddf24490d296b9959cd4e0213	`Microsoft`<http://www.microsoft.com/>	The 'em' unit refers to the property's initial value when specified on the root element.
 orphans-001		breaks inside elements: orphans initial value	paged	http://www.w3.org/TR/CSS21/page.html#break-inside,http://www.w3.org/TR/css3-page/#breaks-inside	953c3caed0530e4dd244c8aa05a41bd4a701f1ea	`Tom Clancy`<mailto:tclancy@revenution.com>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The initial value of the 'orphans' property is 2.
 orphans-002		breaks inside elements: orphans - block-level only	paged	http://www.w3.org/TR/CSS21/page.html#break-inside	0b30e80d7f2341ccb4aeb2fdaa3b00ba72e5a707	`Tom Clancy`<mailto:tclancy@revenution.com>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The 'orphans' property is only applied to block-level elements.
 orphans-003		breaks inside elements: orphans - inheritance	paged	http://www.w3.org/TR/CSS21/page.html#break-inside	ca4a0cbe9fc02b034c55bf59203d5df9eb3bc765	`Tom Clancy`<mailto:tclancy@revenution.com>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The 'orphans' property is inherited.
@@ -8675,7 +8676,6 @@ position-relative-nested-001	reference/position-relative-nested-001-ref	Vertical
 position-static-001	reference/position-static-001-ref	Content laid out in normal flow when 'position' is set to 'static'		http://www.w3.org/TR/CSS21/visuren.html#propdef-position,http://www.w3.org/TR/CSS21/visuren.html#choose-position	882afc6087f66a2f37ca346effe6b3f54c3ed9f7	`Microsoft`<http://www.microsoft.com/>	Static positioned elements are not affected by top, right, bottom, left property settings.
 positioning-float-001	reference/positioning-float-001-ref	Positioning a left floated element		http://www.w3.org/TR/CSS21/visuren.html#positioning-scheme	50264c490ae9409683f8a072e279099602f1c77c	`Microsoft`<http://www.microsoft.com/>	Floating a box will first lay out the box then shift it to the left.
 positioning-float-002	reference/positioning-float-002-ref	Positioning a right floated element		http://www.w3.org/TR/CSS21/visuren.html#positioning-scheme	42efe1fd42c36b2c1b349ef7f690f213a46cf241	`Microsoft`<http://www.microsoft.com/>	Floating a box will first lay out the box then shift it to the right.
-positive-integer-001		Parsing signed integers		http://www.w3.org/TR/CSS21/syndata.html#numbers	98dfaa21253c1d43cf700a11d1cc431e5ae1aaf0	`Microsoft`<http://www.microsoft.com/>	Positively signed integers are treated the same as non-signed integers.
 pseudo-001	reference/no-red-filler-text-ref	Pseudo elements before simple selector		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	751666f6149112d7bad0551e021a8a00307f3b23	`Microsoft`<http://www.microsoft.com/>	A pseudo-selector cannot be followed by a simple selector.
 pseudo-002	reference/filler-text-below-green	First-line pseudo-element case sensitivity		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	a4039e47008a7a44973d8336a2aab28afe3968a6	`Microsoft`<http://www.microsoft.com/>	First-line is case-insensitive.
 pseudo-003		Multiple pseudo-classes - hover and active	interact	http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	2c843f0711e025efdf9d19917e90a88b82535c50	`Microsoft`<http://www.microsoft.com/>	Hover and active pseudo-classes can be applied at the same time.
@@ -8694,10 +8694,10 @@ pseudo-016	reference/no-red-filler-text-ref	Pseudo elements not the last (invali
 pseudo-elements-001		Transitioning Pseudo Elements	dom,script	http://www.w3.org/TR/css3-transitions/#transition-property-property,http://www.w3.org/TR/CSS21/generate.html#before-after-content,http://www.w3.org/TR/css3-content/	2e680348ce4298026d6dfdcc70f26e24fe534ff7	`Rodney Rehm`<http://rodneyrehm.de/en/>	Test checks that transitions are run on pseudo elements
 quoted-keywords-001	reference/no-red-filler-text-ref	Parsing single quoted property keywords	invalid	http://www.w3.org/TR/CSS21/syndata.html#keywords	a64d0840d126da498415b25ca1f5d5267d7f0a32	`Microsoft`<http://www.microsoft.com/>	Rules with property keywords which are surrounded by single quotes are ignored.
 quoted-keywords-002	reference/no-red-filler-text-ref	Parsing double quoted value keywords	invalid	http://www.w3.org/TR/CSS21/syndata.html#keywords	c414e10e62d7231538199d21b394d207014ea3ac	`Microsoft`<http://www.microsoft.com/>	Rules with value keywords which are surrounded by double quotes are ignored.
-quoted-string-001		Parsing of single quotes inside double quotes		http://www.w3.org/TR/CSS21/syndata.html#strings	107ee83ed431a8abb7dec80ffed6e71e3a3e5ca9	`Microsoft`<http://www.microsoft.com/>	Single quotes are allowed in strings that are double quoted.
-quoted-string-002		Parsing of double quotes inside single quotes		http://www.w3.org/TR/CSS21/syndata.html#strings	39f9bca485368a6611afaf3a75055158ab3f02b3	`Microsoft`<http://www.microsoft.com/>	Double quotes are allowed in strings that are single quoted.
-quoted-string-003		Parsing of escaped quotes (single within single)		http://www.w3.org/TR/CSS21/syndata.html#strings	1848569c68a274b7fa9c3da6bd3b0a30b29101da	`Microsoft`<http://www.microsoft.com/>	Single quotes cannot occur inside single quotes unless escaped.
-quoted-string-004		Parsing of escaped double quotes		http://www.w3.org/TR/CSS21/syndata.html#strings	5ac33e5ee353283375ec1ff428e8ed5e658181de	`Microsoft`<http://www.microsoft.com/>	Double quotes cannot occur inside double quotes unless escaped.
+quoted-string-001	reference/quoted-string-001-ref	Parsing of single quotes inside double quotes		http://www.w3.org/TR/CSS21/syndata.html#strings	b5c42f39f3eb1af9b2768ceb07e3865a2e52d27f	`Microsoft`<http://www.microsoft.com/>	Single quotes are allowed in strings that are double quoted.
+quoted-string-002	reference/quoted-string-002-ref	Parsing of double quotes inside single quotes		http://www.w3.org/TR/CSS21/syndata.html#strings	3a10759c246392c163407c9f7edbfb07401328f6	`Microsoft`<http://www.microsoft.com/>	Double quotes are allowed in strings that are single quoted.
+quoted-string-003	reference/quoted-string-001-ref	Parsing of escaped quotes (single within single)		http://www.w3.org/TR/CSS21/syndata.html#strings	9f364d0a9debe8977cfa710f8f0eeb373407e73b	`Microsoft`<http://www.microsoft.com/>	Single quotes cannot occur inside single quotes unless escaped.
+quoted-string-004	reference/quoted-string-002-ref	Parsing of escaped double quotes		http://www.w3.org/TR/CSS21/syndata.html#strings	959fd29830d0b9d0166d6497122436e459b8f9b8	`Microsoft`<http://www.microsoft.com/>	Double quotes cannot occur inside double quotes unless escaped.
 quotes-001		Quotes with two values		http://www.w3.org/TR/CSS21/generate.html#propdef-quotes,http://www.w3.org/TR/CSS21/generate.html#quotes-specify	6ef1fddce96455091b34a4499d60fd653e804b40	`Microsoft`<http://www.microsoft.com/>	Verify that quotes is supported when specifying only one set of quotes.
 quotes-002		Quotes with four values		http://www.w3.org/TR/CSS21/generate.html#propdef-quotes,http://www.w3.org/TR/CSS21/generate.html#quotes-specify	4304dcc38138e73b6ba581a7d9faa5aec04bcaa5	`Microsoft`<http://www.microsoft.com/>	The 'quotes' property handles specifying two sets of quotes.
 quotes-003		Quotes with six values		http://www.w3.org/TR/CSS21/generate.html#propdef-quotes,http://www.w3.org/TR/CSS21/generate.html#quotes-specify	64ad18e33acdc6ae94fe6e618d1086a58e31630b	`Microsoft`<http://www.microsoft.com/>	The 'quotes' property handles specifying three sets of quotes.
@@ -8994,9 +8994,10 @@ run-in-text-between-002	reference/run-in-text-ref	Run in - dynamically inserted
 run-in-text-between-003	reference/run-in-text-ref	Run in - dynamically changed text should prevent running in	dom	http://www.w3.org/TR/CSS21/visuren.html#run-in	a9deb49be220ba4d01024757bcb1e391a6e4dbba	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	Tests that run-ins don't run in if there's dynamically changed text between them and the block.
 run-in-text-between-004	reference/run-in-basic-ref	Run in - dynamically removed text should allow running in	dom	http://www.w3.org/TR/CSS21/visuren.html#run-in	701b19a8dae2b4b661641d669c42e00883ad2e35	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	Tests that run-ins run in if text is dynamically removed from between them and the block.
 run-in-text-between-005	reference/run-in-basic-ref	Run in - dynamically set to whitespace text should allow running in	dom	http://www.w3.org/TR/CSS21/visuren.html#run-in	d7fa420809bc09607ad23eae4224b6f81ed3cedc	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	Tests that run-ins run in if text is dynamically set to whitespace between them and the block.
+select-cursor-001-manual		cursor property and select element	HTMLonly,interact	https://drafts.csswg.org/css-ui-3/#cursor,https://drafts.csswg.org/css2/ui.html#cursor-props	a28f3026bed183a42b3255b9e8983a9b0addbdec	`Chris Rebert`<http://chrisrebert.com>	Hovering the pointer over a select menu on top of an element with a cursor set should not display said cursor
 selectors-001		CSS Selectors (basic)		http://www.w3.org/TR/CSS21/selector.html#pattern-matching	393931454d1f9ee46fd5898f900540e73f46ba28	`Ian Hickson`<mailto:ian@hixie.ch>	
 selectors-002		CSS Selectors (basic tests)		http://www.w3.org/TR/CSS21/selector.html#type-selectors	324e66b413fd52a8733366d16ab3cbe63efd7b17	`Ian Hickson`<mailto:ian@hixie.ch>	
-selectors-parsing-001		CSS: Selector Parsing and Invalid Pseudo-Elements		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	8fee91da912f1f47ed82fcf74351c4a59b02a7f5	`Ian Hickson`<mailto:ian@hixie.ch>	
+selectors-parsing-001	reference/selectors-parsing-001-ref	CSS: Selector Parsing and Invalid Pseudo-Elements		http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	4730dd497040aee8a611c9bcbbff167414bb3646	`Ian Hickson`<mailto:ian@hixie.ch>	
 separated-border-model-001		Distance between the table border and a bordering cell		http://www.w3.org/TR/CSS21/tables.html#separated-borders	ab3fd30a5f7b961667fc7ae8931b6097c7a44d3c	`Microsoft`<http://www.microsoft.com/>	The distance between table border and bordering cell equals table padding + cell's border spacing.
 separated-border-model-003		HTML/XHTML table width equation		http://www.w3.org/TR/CSS21/tables.html#separated-borders	888d164c8c95c999b21d857a61d2cef899a88d6d	`Microsoft`<http://www.microsoft.com/>	The width of an HTML/XHTML table is the distance between the left and right table border edges.
 separated-border-model-003a	reference/ref-filled-green-100px-square	table width as set when greater than sum of columns width		http://www.w3.org/TR/CSS21/tables.html#separated-borders	4acee35114b703f9435879329e8b0a0ce9c582c1	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	The width of an HTML/XHTML table is the distance between the left and right table border edges. The width of a table with 'table-layout' set to 'fixed' is the greater of the value of the 'width' property for the <table> element and the sum of the columns width (plus cell spacing and cell borders). If the table is wider than the sum of columns' width, then the extra (exceeding) space should be distributed over the columns.
@@ -9011,9 +9012,9 @@ separated-border-model-006		Row and column backgrounds in the separated borders
 separated-border-model-007	reference/separated-border-model-007-ref	Border-spacing - contiguous table-row-groups (thead and tbody)		http://www.w3.org/TR/CSS21/tables.html#separated-borders	e7dae1ccf870366ed482e2071b688e58e0191393	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When a table element has 2 contiguous table-row-groups (thead, tbody, tfoot or more than 1 tbody elements), then border-spacing between such table-row-groups - thead and tbody in this testcase - must merge, must collapse into one.
 separated-border-model-008	reference/separated-border-model-007-ref	Border-spacing - contiguous table-row-groups (tbody and tfoot)		http://www.w3.org/TR/CSS21/tables.html#separated-borders	ecd2502a34347eacbeb76c3111ec7e3c6aa31b51	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When a table element has 2 contiguous table-row-groups (thead, tbody, tfoot or more than 1 tbody elements), then border-spacing between such table-row-groups - tbody and tfoot in this testcase - must merge, must collapse into one.
 separated-border-model-009	reference/separated-border-model-007-ref	Border-spacing - contiguous table-row-groups (2 tbodies)		http://www.w3.org/TR/CSS21/tables.html#separated-borders	ae0c6329ae2cf2a3847040d569d822d374cf7e39	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	When a table element has 2 contiguous table-row-groups (thead, tbody, tfoot or more than 1 tbody elements), then border-spacing between such table-row-groups - 2 tbodies in this testcase - must merge, must collapse into one.
-sgml-comments-000		SGML comments		http://www.w3.org/TR/CSS21/syndata.html#comments	251176b218f63632477cee840de7b3f240745549	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	UAs must ignore SGML comment delimiters between statements.
+sgml-comments-000	reference/ref-this-text-should-be-green	SGML comments		http://www.w3.org/TR/CSS21/syndata.html#comments	a91d756f57d28c61ea4acc492541e0715521a75d	`Gabriele Romanato`<mailto:gabriele.romanato@gmail.com>	UAs must ignore SGML comment delimiters between statements.
 sgml-comments-001	reference/filler-text-below-green	Parsing SGML comments		http://www.w3.org/TR/CSS21/syndata.html#comments	48a6f1c8501687b1fb041a5a4111302d51f24cdf	`Microsoft`<http://www.microsoft.com/>	SGML comment tokens are parsed and ignored.
-sgml-comments-002		Parsing of CDO/CDC in stylesheets		http://www.w3.org/TR/CSS21/syndata.html#comments	019bdc428b4d41ff8c0568c0918761054efe4ead	`Ian Hickson`<mailto:ian@hixie.ch>	
+sgml-comments-002	reference/sgml-comments-002-ref	Parsing of CDO/CDC in stylesheets		http://www.w3.org/TR/CSS21/syndata.html#comments	fbf88cdc37877fd2d23a30b742d44022b7712769	`Ian Hickson`<mailto:ian@hixie.ch>	
 shand-border-000	reference/shand-border-000-ref	Shorthand Properties (border)		http://www.w3.org/TR/CSS21/about.html#shorthand	1f1233e156bc1791deb976993808ec1cbcc5c554	`L. David Baron`<http://dbaron.org/>	
 shand-border-001	reference/ref-if-there-is-no-red	Shorthand Properties (border) - maximum of 3 border subproperties	invalid	http://www.w3.org/TR/CSS21/box.html#border-shorthand-properties,http://www.w3.org/TR/CSS21/about.html#shorthand	090681aa062e7927c73b3b7389072c821ff4a029	`G&eacute;rard Talbot`<http://www.gtalbot.org/BrowserBugsSection/css21testsuite/>	The 'border' shorthand property, 'border-top' shorthand property and 'border-bottom' shorthand property accept a maximum of 3 border subproperties.
 shand-font-000	reference/shand-font-000-ref	Shorthand Properties (font)		http://www.w3.org/TR/CSS21/about.html#shorthand	81840472449eb88eb4647a4dfcf3c4f6f26fe3f5	`L. David Baron`<http://dbaron.org/>	
@@ -9042,7 +9043,7 @@ stack-floats-002	reference/stack-floats-001-ref	Stacking order: Floats and Block
 stack-floats-003	reference/stack-floats-001-ref	Stacking order: Floats and Blocks in Inlines	ahem	http://www.w3.org/TR/CSS21/visuren.html#layers,http://www.w3.org/TR/CSS21/visuren.html#floats	ac5b5543f883cb0afcced591d9ced7834c70c856	`Ian Hickson`<mailto:ian@hixie.ch>	
 stack-floats-004	reference/stack-floats-001-ref	Stacking order: Floats and Blocks in Inlines	ahem	http://www.w3.org/TR/CSS21/visuren.html#layers,http://www.w3.org/TR/CSS21/visuren.html#floats	f9435d87cef472bda1be3c78a3fcd901f3906343	`Ian Hickson`<mailto:ian@hixie.ch>	
 stack-overflow-001		Stacking order and overflow		http://www.w3.org/TR/CSS21/visufx.html#overflow	0ac2075313895de5408d667a6624eb9b684c0be8	`Ian Hickson`<mailto:ian@hixie.ch>	
-strings-000		Newlines in strings		http://www.w3.org/TR/CSS21/syndata.html#strings	fdd76901dc56841c1106381bc5618b0d4c6bf873	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
+strings-000	reference/ref-this-text-should-be-green	Newlines in strings		http://www.w3.org/TR/CSS21/syndata.html#strings	3f9070555ce98df41c88f8eb04f1d1deb1ea329f	`Boris Zbarsky`<mailto:bzbarsky@mit.edu>	
 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>	
@@ -9868,7 +9869,7 @@ units-001	reference/units-001-ref	Units: Equivalence	ahem	http://www.w3.org/TR/C
 units-002	reference/units-002-ref	Units: ex	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	8820b419ae1f6d8d9712c837909a96f980868396	`Ian Hickson`<mailto:ian@hixie.ch>	
 units-003	reference/units-003-ref	Units: ex	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	ef5717eecdd4d8aa19c8b6ad49d9518e95ab2cc3	`Ian Hickson`<mailto:ian@hixie.ch>	
 units-004	reference/units-004-ref	Units: ex	ahem	http://www.w3.org/TR/CSS21/syndata.html#length-units	298881b918329c6e213ae3181a00016313542946	`Ian Hickson`<mailto:ian@hixie.ch>	
-units-005		Units: em (0.87em floats)		http://www.w3.org/TR/CSS21/syndata.html#length-units	0d5ad8f40a670300045f8f98efcab74b923996cd	`Ian Hickson`<mailto:ian@hixie.ch>	
+units-005	reference/units-005-ref	Units: em (0.87em floats)		http://www.w3.org/TR/CSS21/syndata.html#length-units	7740a320b02c33d69b30e6f61440f79fefd76c29	`Ian Hickson`<mailto:ian@hixie.ch>	
 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>	
@@ -9877,25 +9878,25 @@ universal-selector-002		Implied universal selector for pseudo selector		http://w
 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'.
-unterminated-string-001		Error handling of unterminated strings	invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	7b3d0ffc5eee37f59e4a784748cd8d9357cee5aa	`Microsoft`<http://www.microsoft.com/>	When the parser encounters an unterminated string, the parser drops everything up to the next ';'.
+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.
 uri-003	reference/no-red-filler-text-ref	URL with missing closing parenthesis	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	4a87a21092abcb735c658a83ee6e5877c73c0260	`Microsoft`<http://www.microsoft.com/>	Url functions with missing closing parenthesis are ignored.
-uri-004		URL function with URI that has escaped special chars	image	http://www.w3.org/TR/CSS21/syndata.html#uri	b8193cd9c259089dacfdb5075eedf8dc0859bd5e	`Microsoft`<http://www.microsoft.com/>	URI escapes are allowed in URL functions.
-uri-005		URL function with escaped special chars - single quote	image	http://www.w3.org/TR/CSS21/syndata.html#uri	118d27c71bfff019b879c3400d9196a23d01e6aa	`Microsoft`<http://www.microsoft.com/>	Single quote characters appearing in an unquoted URI need to be escaped with a backslash so that the resulting URI value is a URI token.
+uri-004	reference/ref-green-background	URL function with URI that has escaped special chars	image	http://www.w3.org/TR/CSS21/syndata.html#uri	f398813b293e8353317901a55009bb6e0fd5632b	`Microsoft`<http://www.microsoft.com/>	URI escapes are allowed in URL functions.
+uri-005	reference/ref-green-background	URL function with escaped special chars - single quote	image	http://www.w3.org/TR/CSS21/syndata.html#uri	cf2dee1e554e78f8e3a318a49f59b5bf1d5215da	`Microsoft`<http://www.microsoft.com/>	Single quote characters appearing in an unquoted URI need to be escaped with a backslash so that the resulting URI value is a URI token.
 uri-006	reference/no-red-filler-text-ref	Invalid character (*) after URL function values	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	e194a428f88ca8e8faa726ff5004dde06c8c0c12	`Microsoft`<http://www.microsoft.com/>	Special CSS characters following URL strings invalidate the entire url assignment.
 uri-007	reference/no-red-filler-text-ref	Invalid character (&) after URL functions values	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	e7fab72cf0198ca4711275e874a24f848cfd86a8	`Microsoft`<http://www.microsoft.com/>	Invalid characters following URL strings invalidate the entire url assignment.
 uri-008	reference/no-red-filler-text-ref	Invalid characters (alpha) before URL function values	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	f9fea3bf598e7bf081543336b854c1301e32e71c	`Microsoft`<http://www.microsoft.com/>	Alpha characters preceding URL strings invalidate the entire url assignment.
 uri-009	reference/no-red-filler-text-ref	Invalid character (/) before URL functions	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	4790543b15e3799ef2fd01574c7175153839050e	`Microsoft`<http://www.microsoft.com/>	A slash character preceding URL string invalidates the entire url assignment.
 uri-010	reference/no-red-filler-text-ref	Invalid character (_) before URL functions	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	cb586834dbfbd00e398327a544a7805fd2ae7c1d	`Microsoft`<http://www.microsoft.com/>	An underscore character preceding URL string invalidates the entire url assignment.
 uri-011	reference/no-red-filler-text-ref	Invalid character (=) before URL functions	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	8ee9e9b077a9a882a77d8e556215ad32592a0048	`Microsoft`<http://www.microsoft.com/>	An equal sign character preceding URL string invalidates the entire url assignment.
-uri-012		Error handling of broken url() - balancing braces	invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	37b87b1dbcbb973d92496b6aa4d73cc0270b6a50	`Ian Hickson`<mailto:ian@hixie.ch>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	
+uri-012	reference/uri-012-ref	Error handling of broken url() - balancing braces	invalid	http://www.w3.org/TR/CSS21/syndata.html#uri	e876f304de4636f8a5245dd1df1f0643945ab01d	`Ian Hickson`<mailto:ian@hixie.ch>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	
 uri-013	reference/uri-013-ref	handling of invalid url() functions	invalid	http://www.w3.org/TR/CSS21/syndata.html#tokenization,http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	4ca482604467a6b27c9f2082796d9388d037a3c2	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	
-uri-014		Unquoted commas in url()		http://www.w3.org/TR/CSS21/syndata.html#uri	a53eca3dcea35b4a3acc9eb1e24e06e27bbea4f5	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Unquoted commas inside url() are valid.
-uri-015		Escaped url() functional notation		http://www.w3.org/TR/CSS21/syndata.html#uri	e79cf5f8475273a5fc775c9c18876647565d510f	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	url() notation is case-insensitive and can be escaped.
-uri-016		Error handling of broken url() with open /*		http://www.w3.org/TR/CSS21/syndata.html#uri	f46f37c586a411e558f8093ff6ce31937c6af1f8	`Ian Hickson`<mailto:ian@hixie.ch>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Comments are just regular tokens inside unquoted URLs.
-uri-017		Unclosed URI Token at EOF (in declaration)	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	9f7991f7af09a8b98281ad2f3222db91fce56527	`Bert Bos`<mailto:bert@w3.org>	User agents must close open URI constructs and style rules at the end of the style sheet.
-uri-018		Unclosed URI Token at EOF (in @import)	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	f9fecbbd3b7644c0964697d4d7f6bcb3e2ccabca	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must close open URI constructs and statements at the end of the style sheet.
+uri-014	reference/ref-green-background	Unquoted commas in url()		http://www.w3.org/TR/CSS21/syndata.html#uri	c944498e840590ecde933a0b4a090b7ceb9dafa1	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Unquoted commas inside url() are valid.
+uri-015	reference/ref-green-background	Escaped url() functional notation		http://www.w3.org/TR/CSS21/syndata.html#uri	8ba0157bc5cf38d1e2ab65282cf1d2997b5553d8	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	url() notation is case-insensitive and can be escaped.
+uri-016	reference/uri-016-ref	Error handling of broken url() with open /*		http://www.w3.org/TR/CSS21/syndata.html#uri	131fefc9a82309864af5baed0011d07ecd2a78e6	`Ian Hickson`<mailto:ian@hixie.ch>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Comments are just regular tokens inside unquoted URLs.
+uri-017	reference/uri-017-ref	Unclosed URI Token at EOF (in declaration)	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	6d19a196077d8c11349f2ba3d8dee2732946dcfc	`Bert Bos`<mailto:bert@w3.org>	User agents must close open URI constructs and style rules at the end of the style sheet.
+uri-018	reference/ref-this-text-should-be-green	Unclosed URI Token at EOF (in @import)	image,invalid	http://www.w3.org/TR/CSS21/syndata.html#parsing-errors	65b9bb7d3226d46e37132e8a941df28aa1446f4f	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	User agents must close open URI constructs and statements at the end of the style sheet.
 user-stylesheet-001		User defined stylesheet can be applied	userstyle	http://www.w3.org/TR/CSS21/cascade.html	bdb684bf516242962072c5835fd586d701c703cd	`Microsoft`<http://www.microsoft.com/>	User stylesheet can be applied to the page.
 user-stylesheet-002		User defined stylesheet can be applied and persisted	interact,userstyle	http://www.w3.org/TR/CSS21/cascade.html	0a679a59c7bf15c5fea14c55d03ee37d8764ffcb	`Microsoft`<http://www.microsoft.com/>	The user stylesheet is still applied after close and reopen the user agent window.
 user-stylesheet-003		Rules with normal declarations in an user defined stylesheet can be overriden by rules with normal declarations from author in a style block	userstyle	http://www.w3.org/TR/CSS21/cascade.html	29d0c796f0e982cc7ec5420c84437d91f91813b8	`Microsoft`<http://www.microsoft.com/>	A CSS rule (with normal - not !important - declarations) in an author style sheet have more weight than a CSS rule (with normal - not !important -declarations) in an user style sheet.
@@ -10005,38 +10006,6 @@ vertical-align-baseline-010		Baseline alignment with an inline-block element par
 vertical-align-boxes-001		Vertical Alignment boxes: replaced elements	ahem,image	http://www.w3.org/TR/CSS21/visudet.html#line-height	ea20cd0e29e45da3941ffba447d828bdb97dc458	`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	Vertical alignment aligns the margin box of inline replaced elements.
 vertical-align-sub-001	reference/vertical-align-sub-001-ref	Vertical-align set to 'sub' does not adjust font-size		http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align,http://www.w3.org/TR/CSS21/visudet.html#leading	f6f78c9fe452d927dafd31fac65954862b72c202	`Microsoft`<http://www.microsoft.com/>	The 'vertical-align' property value 'sub' has no effect on the font-size of an element's text.
 vertical-align-super-001	reference/vertical-align-sub-001-ref	Vertical-align set to 'super' does not adjust font-size		http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align,http://www.w3.org/TR/CSS21/visudet.html#leading	e99029cbeff79d345336ea9ddb33274302e13a5f	`Microsoft`<http://www.microsoft.com/>	The 'vertical-align' property value 'super' has no effect on the font-size of an element's text.
-vertical-alignment-002a		vertical align - 'baseline' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	a55994c93e6652bdc61229154fe73727bd2c9aea	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-002b		vertical align - 'baseline' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	779a3696b7909f11787ad979d92c965675b8ed71	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-003a		vertical align - 'baseline' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	66706a353742efd4400d64575c633bb17a2a7252	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-003b		vertical align - 'baseline' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	c28364f9b1f41b8538e624119234b1d35d6c6091	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-005a		vertical align - 'sub' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	2df8dff5be7453c111fb9364ef9d796a91095b3a	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-005b		vertical align - 'sub' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	2fc7c00892fc1d5860633a96bba4ba7878ad7004	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-008a		vertical align - 'super' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	9dc8848f9db104ed33e3001e946369278588df9c	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-008b		vertical align - 'super' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	7de9f0763dbb93b0f55dceb7b80116c87ad800df	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-011a		vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	e3c5648ce732c30881a84fb5a0a8083191332a56	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-011b		vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	724bbb86a2b9ec3bd9252fec92cacd6212775175	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-012l		vertical align - 'zero length (0em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	1684f5ad59fd0c5ce9f9d3190bf569388b3557ba	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-012r		vertical align - 'zero length (0em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	dcd288dd395eea47285230ca20aa83dd6c874f17	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-014a		vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	199a8e04915d4e564618ef120bf32e5c568cafc0	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-014b		vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	755eb3f5800991c4d7df16dc70d2aaf30e419c42	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-015a		vertical align - 'positive length (0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	32b2362ace97e299f7beaa3aac8d3323837c7fc8	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-015b		vertical align - 'positive length (0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	f059163e577bcbadccf1e2912c2c8724777930c2	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-017a		vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	83b231bd5ad62e4e981f504bedbe7bfde444335d	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-017b		vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	20354412b9971eb45aafda4db62c290f6a2b1602	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-018a		vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	7cc30a291d2c69b03bd4179951b87c58e2a02ccb	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-018b		vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	bda9934745cc38f21bcb4235eac2d5824d849f9f	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-020a		vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	6533d451114b23d657e6bbc8362390a1c4aaf1eb	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-020b		vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)	image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	7b7ff221754d9c3bc955380e044413ccfbf7ee8b	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-021a		vertical align - 'zero percentage (0%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	9ddfeee8aeba9e1241ce506ec75af1ba37f6ef06	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-021b		vertical align - 'zero percentage (0%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	0e68e5e6821c0645ff08d40eb02e7ddd87d99caf	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-023a		vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	d42792f46d6c5d9052eaf7ed1c7981d3968fdc07	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-023b		vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	a13b1e018382f0e99499b691e9cbbe8f2bcfb740	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-024a		vertical align - 'positive percentage (50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	339511c5b7a5eef6400b44a7cb6403adebe16ae0	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-024b		vertical align - 'positive percentage (50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	d6cc4618d830dfb7a86b471d7b149546f7721bd4	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-026a		vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	777a16060504fa5c1a2c649279ee6dbcb56729ad	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-026b		vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	fb3d8d2c8ec17a80bc05d9cf6027855dab6b9836	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.
-vertical-alignment-027a		vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	ca2c37b2acc7a2be0e438b5069acd2286487b6ab	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
-vertical-alignment-027b		vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)	ahem,image	http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment,http://www.w3.org/TR/CSS21/visudet.html#line-height	eb3ef979b26f31507a2f72ba374274fd22113364	`Hajime Shiozawa`<mailto:hajime.shiozawa@gmail.com>	This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.
 viewport-001		Viewport resize can change layout	interact,may	http://www.w3.org/TR/CSS21/visuren.html#viewport	ee2403cfe1c614848472858de2b9f8a9ce32a325	`Microsoft`<http://www.microsoft.com/>	Resizing the viewport may change the layout of page.
 viewport-002		Scrolling mechanism	interact,scroll,should	http://www.w3.org/TR/CSS21/visuren.html#viewport	4165251e6f75e74e08615646f82d00f33cd66bfe	`Microsoft`<http://www.microsoft.com/>	Scrolling mechanism should be available when canvas is larger than viewport.
 viewport-003		Scrolling mechanism and right-to-left	interact,scroll,should	http://www.w3.org/TR/CSS21/visuren.html#viewport	bff48e6b88066cb2bf700399a7cb30fb4f004818	`Microsoft`<http://www.microsoft.com/>	Scrolling mechanism should be available when canvas is larger than viewport even when page is set to right-to-left.
@@ -10182,8 +10151,8 @@ white-space-processing-055		White space processing model with 'zero width no bre
 white-space-processing-056		White space processing model with 'ideographic space' character	ahem	http://www.w3.org/TR/CSS21/text.html#white-space-model	18b3bcfd76b1a9163a93b6aeed3b9d3b5d903be3	`Microsoft`<http://www.microsoft.com/>	The 'ideographic space' character is not collapsed by the white space processing model.
 white-space-processing-057		White-space 'pre-wrap' and tab at end of line	ahem,may	http://www.w3.org/TR/CSS21/text.html#white-space-model	76ca640feff22a7b851b1266465cad7f540e7d16	`Microsoft`<http://www.microsoft.com/>	A tab at end of line may be removed when 'white-space' is set to 'pre-wrap'.
 white-space-processing-058		White-space 'pre-wrap' and space at end of line before following inline element	ahem,may	http://www.w3.org/TR/CSS21/text.html#white-space-model	4063567cbd4849ab75cfcf1591fa09e39d7966b8	`Microsoft`<http://www.microsoft.com/>	A space at end of line may be removed when 'white-space' is set to 'pre-wrap'.
-whitespace-001		White space - em-space (U+2003)		http://www.w3.org/TR/CSS21/syndata.html#tokenization	aec9b731b1e112c54df3f7d3a7d42f2104fc5e2a	`Microsoft`<http://www.microsoft.com/>	Em-space is not treated as white space.
-whitespace-002		White space - ideographic space (U+3000)		http://www.w3.org/TR/CSS21/syndata.html#tokenization	cda226c74c3e95eb9cc46444b272f394ad341a6a	`Microsoft`<http://www.microsoft.com/>	Ideographic space is not treated as white space.
+whitespace-001	reference/no-red-filler-text-ref	White space - em-space (U+2003)		http://www.w3.org/TR/CSS21/syndata.html#tokenization	a03d15e7e718a0197bc291f056770f02984370fc	`Microsoft`<http://www.microsoft.com/>	Em-space is not treated as white space.
+whitespace-002	reference/no-red-filler-text-ref	White space - ideographic space (U+3000)		http://www.w3.org/TR/CSS21/syndata.html#tokenization	1e25d2450954c3a034e1bb6e209164ce626116cd	`Microsoft`<http://www.microsoft.com/>	Ideographic space is not treated as white space.
 widows-001		breaks inside elements: widows - initial value	paged	http://www.w3.org/TR/CSS21/page.html#break-inside	a5a0a0b0d45560b3f5f85aab4351bb689957cfbd	`Tom Clancy`<mailto:tclancy@revenution.com>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The initial value of the 'widows' property is 2.
 widows-002		breaks inside elements: orphans - block-level only	paged	http://www.w3.org/TR/CSS21/page.html#break-inside	110cac2ac49d1e7e3b3af9e5f4120e7c93f27a89	`Tom Clancy`<mailto:tclancy@revenution.com>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The 'widows' property is only applied to block-level elements.
 widows-003		breaks inside elements: widows - inheritance	paged	http://www.w3.org/TR/CSS21/page.html#break-inside	7808a7d00cd3a80834931778303ec0a3db01a782	`Tom Clancy`<mailto:tclancy@revenution.com>,`Elika J. Etemad`<http://fantasai.inkedblade.net/contact>	The 'widows' property is inherited.
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-001.xht
index bce1f26a142..07b942b5365 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP Charset vs BOM</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="reference/at-charset-001-ref.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The Byte Order Mark in the stylesheet overrides the HTTP charset setting." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-002.xht
index 8c52f1abf24..98495bf9935 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-002.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP Charset over @charset</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the @charset designation in the stylesheet." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-003.xht
index e065fa453c7..721413a42c8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-003.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over link charset</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the charset designation in the link tag." />
         <link charset="windows-1252" href="support/at-charset-003.css" rel="Stylesheet" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-004.xht
index 8dc7985880f..dd97ea0a4fa 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-004.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over set referring code page (UTF-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the referring document's code page." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-005.xht
index 6c5b8163fce..0391fcfb3cb 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-005.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over set referring code page (windows-1252)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the charset designation in the referring document's meta tag." />
         <meta http-equiv="Content-Type" content="text/html; windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-006.xht
index de3c2b20284..4576e537a1e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-006.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: HTTP charset over referring code page (not set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the charset of referring document." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-007.xht
index 0482b327639..b24af1f19a2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-007.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset over link charset attribute</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The @charset setting in the stylesheet overrides the charset attribute of the link element." />
         <link rel="Stylesheet" href="support/at-charset-007.css" charset="windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-008.xht
index f33752e3441..6ad9ee8b9ae 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-008.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset over referring document's code page (set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The @charset setting in the stylesheet overrides the referring document's set code page." />
         <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-009.xht
index 8a3319bd76c..c13dcc6ad27 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-009.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset over referring document's code page (unset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The @charset setting in the stylesheet overrides the referring document's unset code page." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-010.xht
index 751f5d5b4c5..8aa779eeda7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-010.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Link charset attribute over referring document's codepage (set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page." />
         <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-011.xht
index 5ce6a58148a..5c674baa1ae 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-011.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Link charset attribute over referring document's codepage (not set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page." />
         <link rel="stylesheet" href="support/at-charset-011.css" charset="shift-JIS" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-012.xht
index c4bd7225340..d16c546cc1b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-012.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Stylesheet encoding via the referring document's encoding (set)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet's encoding is determined by the set encoding of the referring document." />
         <meta http-equiv="Content-Type" content="text/html; charset=shift-JIS" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-014.xht
index 04b50321b11..c93d5378b85 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-014.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Matching BOM and @charset (utf-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-015.xht
index 3bfba5701f3..59e383c4f9b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-015.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Matching BOM and @charset (utf-16 LE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-016.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-016.xht
index 67a0ac66104..133e7242d27 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-016.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-016.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Matching BOM and @charset (utf-16 BE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-019.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-019.xht
index 57fea92612d..65136ced79c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-019.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-019.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: BOM with no @charset (utf-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-8." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-020.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-020.xht
index 35ccdc401f1..093a1c170a6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-020.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-020.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: BOM with no @charset (utf-16LE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-16LE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-021.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-021.xht
index b19a058821f..c37208d445e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-021.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-021.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: BOM with no @charset (utf-16BE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-16BE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-024.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-024.xht
index 41d32e38254..3cf6d816ab8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-024.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-024.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (windows-1252)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as windows-1252." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-025.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-025.xht
index 21f0bf7b5e5..f05f0169e11 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-025.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-025.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (Shift-JIS)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as Shift-JIS." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-026.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-026.xht
index c77d7b3de2c..e3301d96e70 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-026.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-026.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (ISO-8859-6)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as ISO-8859-6." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-027.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-027.xht
index 2f8554069e1..fc17b5cf5d2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-027.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-027.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (Big5)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as Big5." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-028.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-028.xht
index 4e2656b0a01..0989592a851 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-028.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-028.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (UTF-8)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as UTF-8." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-029.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-029.xht
index a4513c2d324..ca98efc4fd8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-029.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-029.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (UTF-16LE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16LE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-030.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-030.xht
index b70a7da8e26..af8b227029b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-030.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-030.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset specified (UTF-16BE)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16BE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-040.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-040.xht
index e044030b931..91930ac281f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-040.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-040.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Non-matching @charset (UTF-16BE with UTF-8 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is thrown out due to the mismatched @charset." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-041.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-041.xht
index ad6b45cc466..be5abab6683 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-041.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-041.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Non-matching @charset (UTF-32LE with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is thrown out due to the mismatched @charset." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-042.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-042.xht
index e9881dea6f7..282655fe930 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-042.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-042.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-8." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-043.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-043.xht
index 3a5fa2be6e2..50c0b1e7366 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-043.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-043.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-8." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-044.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-044.xht
index 53d4092a3d7..0c389d8d360 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-044.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-044.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="UTF-32 is not supported." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-045.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-045.xht
index b25970357c7..fc0ac4bfcd0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-045.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-045.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-16LE." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-046.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-046.xht
index e3ff093e954..459ba69970c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-046.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-046.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF16BE." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-047.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-047.xht
index 0508f8289f7..49bd6b8223e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-047.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-047.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Endianness not specified (UTF-16LE encoding with UTF-16 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16LE." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-048.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-048.xht
index a9a1654279b..b4ec3bb73bc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-048.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-048.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Endianness not specified (UTF-16BE encoding with UTF-16 @charset)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF16-BE." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-054.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-054.xht
index dd160923452..06d725bb4a7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-054.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-054.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset in uppercase</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The selector does not match due to the @charset being ignored." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-056.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-056.xht
index f5834787433..4346ed618a5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-056.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-056.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset missing a space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The selector does not match due to the @charset being ignored." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-060.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-060.xht
index 3e5f18284a7..e34adf966a4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-060.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-060.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset with bogus name</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-16LE based on BOM." />
         <style type="text/css">
@@ -15,7 +16,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="平和">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-061.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-061.xht
index 2c71e9485e3..c9e4e272a0d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-061.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-061.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @charset within style block</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The selector does not match due to the @charset being ignored." />
         <style type="text/css">@charset "ISO-8859-1";
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-071.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-071.xht
index 557f35c1abe..6824c651947 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-071.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-071.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-071.css" />
  </head>
  <body>
-  <p class="t&#233;st">This line should be green.</p>
+  <p class="t&#233;st">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/at-charset-072.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-072.xht
index 74b70d9185d..2e0b269caa4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-072.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-072.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/002.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-072.css" />
  </head>
  <body>
-  <p class="t&#3657;st">This line should be green.</p>
+  <p class="t&#3657;st">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/at-charset-073.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-073.xht
index 0981582f97a..475b2520eeb 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-073.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-073.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/003.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-073.css" />
  </head>
  <body>
-  <p class="t&#1097;st">This line should be green.</p>
+  <p class="t&#1097;st">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/at-charset-074.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-074.xht
index 471cf9b58d4..bd1adbda6c9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-074.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-074.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/004.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-074.css" />
  </head>
  <body>
-  <p class="t&#1609;st">This line should be green.</p>
+  <p class="t&#1609;st">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/at-charset-075.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-075.xht
index f5049def9c6..77bf608ec87 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-075.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-075.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/005.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-075.css" />
  </head>
  <body>
-  <p class="t&#953;st">This line should be green.</p>
+  <p class="t&#953;st">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/at-charset-076.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-076.xht
index f47db131116..6579e310ce2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-076.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-076.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/006.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-076.css" />
  </head>
  <body>
-  <p class="t&#1497;st">This line should be green.</p>
+  <p class="t&#1497;st">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/at-charset-077.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-077.xht
index 497208ef182..60fcc498742 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-077.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-charset-077.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/007.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -12,6 +13,6 @@
   <link rel="stylesheet" href="support/at-charset-077.css" />
  </head>
  <body>
-  <p class="t&#1048;st">This line should be green.</p>
+  <p class="t&#1048;st">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/at-import-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-import-009.xht
index 23f362c9adf..8759234b297 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-import-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-import-009.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @import following a known but invalid @rule</title>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules" />
+        <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="@import is respected after known but ignored @rule." />
         <style type="text/css">
@@ -14,6 +15,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-import-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-import-010.xht
index 2f809ed7abc..06dc8678376 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-import-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-import-010.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @import following an invalid selector</title>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules" />
+        <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="@import is respected after invalid (ignored) rule set" />
         <style type="text/css">
@@ -13,6 +14,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-import-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-import-011.xht
index f8193b5dbca..feb1693041f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-import-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-import-011.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: @import following garbage</title>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules" />
+        <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="@import is parsed as part of invalid ruleset           after garbage." />
         <style type="text/css">
@@ -14,6 +15,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-000.xht
index db632836a4a..9fe9d177678 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   @import "support/import-green.css";
@@ -14,7 +15,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-001.xht
index 23b7b236924..0ad44801b0b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   @ import "support/import-red.css";
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-002.xht
index 35c3a67d263..b99b7d3f17a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-keywords-002.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
@@ -15,7 +16,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-rule-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-rule-013.xht
index 2247ce52e85..250a87639f2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-rule-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-rule-013.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/at-rule-013-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="At-rules inside @media blocks are ignored up to         up to the end of the block that contains the invalid at-keyword, or up         to and including the next semicolon (;) or up to and including the next         block ({...}), whichever comes first."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-000.xht
index 8a53a507b06..42d9f66de5d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
@@ -17,7 +18,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-001.xht
index 734e2141983..7852e568684 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: red; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-002.xht
index 5f0746e9215..bdc7986afd5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-002.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: red; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-003.xht
index d829ac67183..42eb595d170 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-003.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: red; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-004.xht
index 159d798afe4..9cde43877dc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/at-rules-004.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: green; }
@@ -16,7 +17,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/attribute-token-selector-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/attribute-token-selector-002.xht
index a0194198880..b090a6bdf55 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/attribute-token-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/attribute-token-selector-002.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: [attr~=""]Attribute Selectors with Empty String Values</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization"/>
+  <link rel="match" href="reference/attribute-token-selector-002-ref.xht"/>
   <meta name="assert" content="[attr~=''] is valid but matches nothing."/>
   <style type="text/css">
     p {
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/bidi-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/bidi-004.xht
new file mode 100644
index 00000000000..131ff792d03
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/bidi-004.xht
@@ -0,0 +1,44 @@
+<!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" lang="en" xml:lang="en">
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>CSS Test: The bidi algorithm and inlines in CSS</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules" />
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="http://unicode.org/reports/tr9/" />
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0" /> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.xht" />
+
+  <meta name="flags" content="may21 ahem" />
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp ‮ ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX ‬ XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/blocks-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/blocks-001.xht
index 7120a8f5484..16e3dfe94d9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/blocks-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/blocks-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing nested blocks and strings in style blocks</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#block" />
+        <link rel="match" href="reference/blocks-001-ref.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="Blocks and strings are parsed with matching terminating pairs." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/c547-indent-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/c547-indent-000.xht
index a41bb579f55..6f367c0f2bc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/c547-indent-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/c547-indent-000.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/REC-CSS1#text-indent"/>
   <link rel="author" title="CSS1 Test Suite Contributors" href="http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html"/>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="match" href="reference/c547-indent-000-ref.xht"/>
   <style type="text/css"><![CDATA[
    div { font: 24px/1 Ahem; width: 18em; color: blue; }
    .one {text-indent: 0.25in;}
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/c5510-padn-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/c5510-padn-000.xht
index 02bee6180b0..1f350870c9e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/c5510-padn-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/c5510-padn-000.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/REC-CSS1#padding"/>
   <link rel="author" title="CSS1 Test Suite Contributors" href="http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html"/>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="match" href="reference/c5510-padn-000-ref.xht"/>
 
   <style type="text/css"><![CDATA[
    body { color: navy; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-001.xht
index dc866c7b84a..7d3423de7f3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-001.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript">
    var style = document.createElement("style");
    var text = document.createTextNode("body { color: red; }");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-002.xht
index d0a9c811ddc..59cbd8e6e0c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-002.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript">
    var style = document.createElementNS("http://www.w3.org/1999/xhtml", "link");
    style.setAttribute("type", "text/css");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-003.xht
index c303a6f8b8f..7a24410441e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-003.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript" id="script">
    var style = document.createElement("style");
    var text = document.createTextNode("body { color: red }");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-004.xht
index c280eab10f1..8189d734d02 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-004.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript" id="script">
    var style = document.createElementNS("http://www.w3.org/1999/xhtml", "link");
    style.setAttribute("type", "text/css");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-005.xht
index 9d5a64f43fc..8dd6ad58e7e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-005.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css" id="style">
    body { color: blue }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-006.xht
index 85d189f14ae..67214b42386 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-006.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <link rel="stylesheet" type="text/css" id="link" href="support/import-red.css"/>
   <script type="text/javascript">
    document.getElementsByTagName("head")[0].removeChild(document.getElementById("link"));
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-control.xht b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-control.xht
index 885407d2e2b..a91fe81f334 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-control.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/cascade-import-dynamic-control.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css" id="test">
    p { color: red; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-000.xht
index a6ae399bc10..6a0ec60b9fa 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of Properties and Keywords (background)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-001.xht
index 5634b92ebd7..b4b45670f24 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of At-rules (@media)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-003.xht
index 71787f836d3..a9249546cc7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-003.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of pseudo-classes and pseudo-elements</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/case-sensitive-003-ref.xht"/>
   <meta name="assert" content="Pseudo-class and pseudo-element names are ASCII         case-insensitive."/>
   <style type="text/css">
     * { color: red; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-004.xht
index eb580fe44ba..35f3acf8b94 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-004.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of :lang() arguments</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters" />
+  <link rel="match" href="reference/case-sensitive-003-ref.xht" />
   <meta name="assert" content="The argument to :lang() is ASCII case-insensitive." />
   <style type="text/css">
     .test-folding { color: red; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-005.xht
index 4bdd8316a91..88b0e746319 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-005.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Case-sensitivity of counter names</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/case-sensitive-005-ref.xht"/>
   <meta name="assert" content="Counter names are case-sensitive."/>
   <style type="text/css">
     .reset { counter-reset: test 5 tEsT 9; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-007.xht
index 7efa02173f9..949065cc9a1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/case-sensitive-007.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Case sensitivity with element selectors</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
         <meta name="flags" content="nonHTML" />
         <meta name="assert" content="Element selectors are case-sensitive in XHTML and XML." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-10.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-10.xht
index c6002bb29e5..5fa00bce9af 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-10.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-10.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model details (1481 tests)</h2>
+  <h2>Visual formatting model details (1449 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -19736,7 +19736,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s10.8">+</a>
         <a href="http://www.w3.org/TR/CSS21/visudet.html#line-height">10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a></th></tr>
-      <!-- 56 tests -->
+      <!-- 24 tests -->
       <tr id="c43-center-000-10.8" class="ahem image">
         <td>
             <a href="c43-center-000.xht">c43-center-000</a></td>
@@ -19944,358 +19944,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-002a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-002a.xht">vertical-alignment-002a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-002b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-002b.xht">vertical-alignment-002b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-003a.xht">vertical-alignment-003a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-003b.xht">vertical-alignment-003b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-005a.xht">vertical-alignment-005a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-005b.xht">vertical-alignment-005b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-008a.xht">vertical-alignment-008a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-008b.xht">vertical-alignment-008b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-011a.xht">vertical-alignment-011a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-011b.xht">vertical-alignment-011b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012l-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-012l.xht">vertical-alignment-012l</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012r-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-012r.xht">vertical-alignment-012r</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-014a.xht">vertical-alignment-014a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-014b.xht">vertical-alignment-014b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-015a.xht">vertical-alignment-015a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-015b.xht">vertical-alignment-015b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-017a.xht">vertical-alignment-017a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-017b.xht">vertical-alignment-017b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-018a.xht">vertical-alignment-018a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-018b.xht">vertical-alignment-018b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-020a.xht">vertical-alignment-020a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-020b.xht">vertical-alignment-020b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-021a.xht">vertical-alignment-021a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-021b.xht">vertical-alignment-021b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-023a.xht">vertical-alignment-023a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-023b.xht">vertical-alignment-023b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-024a.xht">vertical-alignment-024a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-024b.xht">vertical-alignment-024b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-026a.xht">vertical-alignment-026a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-026b.xht">vertical-alignment-026b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-027a.xht">vertical-alignment-027a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-027b.xht">vertical-alignment-027b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
     </tbody>
     <tbody id="s10.8.1">
       <tr><th colspan="4" scope="rowgroup">
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 59c0ef84caf..b9312add45a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-12.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-12.xht
@@ -3811,7 +3811,7 @@
       <tr id="content-counter-000-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-000.xht">content-counter-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -3819,7 +3819,7 @@
       <tr id="content-counter-001-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-001.xht">content-counter-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -3827,7 +3827,7 @@
       <tr id="content-counter-002-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-002.xht">content-counter-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -3835,7 +3835,7 @@
       <tr id="content-counter-003-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-003.xht">content-counter-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -3843,7 +3843,7 @@
       <tr id="content-counter-004-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-004.xht">content-counter-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -3851,7 +3851,7 @@
       <tr id="content-counter-005-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-005.xht">content-counter-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -3859,7 +3859,7 @@
       <tr id="content-counter-006-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-006.xht">content-counter-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -3867,7 +3867,7 @@
       <tr id="content-counter-007-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-007.xht">content-counter-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -3875,7 +3875,7 @@
       <tr id="content-counter-008-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-008.xht">content-counter-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -3883,7 +3883,7 @@
       <tr id="content-counter-009-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-009.xht">content-counter-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -3891,7 +3891,7 @@
       <tr id="content-counter-010-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-010.xht">content-counter-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -3899,7 +3899,7 @@
       <tr id="content-counter-011-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-011.xht">content-counter-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -3907,7 +3907,7 @@
       <tr id="content-counter-012-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-012.xht">content-counter-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -3915,7 +3915,7 @@
       <tr id="content-counter-013-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-013.xht">content-counter-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -3923,7 +3923,7 @@
       <tr id="content-counter-014-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-014.xht">content-counter-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -3931,7 +3931,7 @@
       <tr id="content-counter-015-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-015.xht">content-counter-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -3939,7 +3939,7 @@
       <tr id="content-counter-016-12.2.#propdef-content" class="primary invalid">
         <td><strong>
             <a href="content-counter-016.xht">content-counter-016</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
@@ -8835,7 +8835,7 @@
       <tr id="content-counter-000-12.4.2" class="">
         <td>
             <a href="content-counter-000.xht">content-counter-000</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -8843,7 +8843,7 @@
       <tr id="content-counter-001-12.4.2" class="">
         <td>
             <a href="content-counter-001.xht">content-counter-001</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -8851,7 +8851,7 @@
       <tr id="content-counter-002-12.4.2" class="">
         <td>
             <a href="content-counter-002.xht">content-counter-002</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -8859,7 +8859,7 @@
       <tr id="content-counter-003-12.4.2" class="">
         <td>
             <a href="content-counter-003.xht">content-counter-003</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -8867,7 +8867,7 @@
       <tr id="content-counter-004-12.4.2" class="">
         <td>
             <a href="content-counter-004.xht">content-counter-004</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -8875,7 +8875,7 @@
       <tr id="content-counter-005-12.4.2" class="">
         <td>
             <a href="content-counter-005.xht">content-counter-005</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -8883,7 +8883,7 @@
       <tr id="content-counter-006-12.4.2" class="">
         <td>
             <a href="content-counter-006.xht">content-counter-006</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -8891,7 +8891,7 @@
       <tr id="content-counter-007-12.4.2" class="">
         <td>
             <a href="content-counter-007.xht">content-counter-007</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -8899,7 +8899,7 @@
       <tr id="content-counter-008-12.4.2" class="">
         <td>
             <a href="content-counter-008.xht">content-counter-008</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -8907,7 +8907,7 @@
       <tr id="content-counter-009-12.4.2" class="">
         <td>
             <a href="content-counter-009.xht">content-counter-009</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -8915,7 +8915,7 @@
       <tr id="content-counter-010-12.4.2" class="">
         <td>
             <a href="content-counter-010.xht">content-counter-010</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -8923,7 +8923,7 @@
       <tr id="content-counter-011-12.4.2" class="">
         <td>
             <a href="content-counter-011.xht">content-counter-011</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -8931,7 +8931,7 @@
       <tr id="content-counter-012-12.4.2" class="">
         <td>
             <a href="content-counter-012.xht">content-counter-012</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -8939,7 +8939,7 @@
       <tr id="content-counter-013-12.4.2" class="">
         <td>
             <a href="content-counter-013.xht">content-counter-013</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -8947,7 +8947,7 @@
       <tr id="content-counter-014-12.4.2" class="">
         <td>
             <a href="content-counter-014.xht">content-counter-014</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -8955,7 +8955,7 @@
       <tr id="content-counter-015-12.4.2" class="">
         <td>
             <a href="content-counter-015.xht">content-counter-015</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -8963,7 +8963,7 @@
       <tr id="content-counter-016-12.4.2" class="invalid">
         <td>
             <a href="content-counter-016.xht">content-counter-016</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-15.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-15.xht
index d877722c02a..c207241d9e5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-15.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-15.xht
@@ -627,7 +627,7 @@
       <tr id="font-family-invalid-characters-003-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -638,7 +638,7 @@
       <tr id="font-family-invalid-characters-004-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -649,7 +649,7 @@
       <tr id="font-family-invalid-characters-005-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -660,7 +660,7 @@
       <tr id="font-family-invalid-characters-006-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-16.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-16.xht
index 021d0fed3ff..e196009c3e7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-16.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-16.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Text (608 tests)</h2>
+  <h2>Text (609 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -41,7 +41,7 @@
       <tr id="c547-indent-000-16.1" class="ahem">
         <td>
             <a href="c547-indent-000.xht">c547-indent-000</a></td>
-        <td></td>
+        <td><a href="reference/c547-indent-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text-indent
         </td>
@@ -9216,7 +9216,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s16.6.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/text.html#white-space-model">16.6.1 The 'white-space' processing model</a></th></tr>
-      <!-- 93 tests -->
+      <!-- 94 tests -->
       <tr id="bidi-001-16.6.1" class="">
         <td>
             <a href="bidi-001.xht">bidi-001</a></td>
@@ -9239,6 +9239,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-16.6.1" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="inlines-016-16.6.1" class="primary ahem">
         <td><strong>
             <a href="inlines-016.xht">inlines-016</a></strong></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-18.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-18.xht
index edebd8c4cc8..c15e07a1eb7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-18.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-18.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>User interface (360 tests)</h2>
+  <h2>User interface (361 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="#s18.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/ui.html#cursor-props">18.1 Cursors: the 'cursor' property</a></th></tr>
-      <!-- 41 tests -->
+      <!-- 42 tests -->
       <tr id="cursor-001-18.1" class="image interact">
         <td>
             <a href="cursor-001.xht">cursor-001</a></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-4.xht
index ef260f0c590..17106eb3376 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-4.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-4.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Syntax and basic data types (439 tests)</h2>
+  <h2>Syntax and basic data types (438 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -35,7 +35,7 @@
       <tr id="counters-001-4" class="primary">
         <td><strong>
             <a href="counters-001.xht">counters-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter functions with just the identifier
           <ul class="assert">
@@ -138,7 +138,7 @@
       <tr id="attribute-token-selector-002-4.1.1" class="primary">
         <td><strong>
             <a href="attribute-token-selector-002.xht">attribute-token-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/attribute-token-selector-002-ref.xht">=</a> </td>
         <td></td>
         <td>[attr~=&quot;&quot;]Attribute Selectors with Empty String Values
           <ul class="assert">
@@ -149,7 +149,7 @@
       <tr id="core-syntax-009-4.1.1" class="primary">
         <td><strong>
             <a href="core-syntax-009.xht">core-syntax-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Syntactic White Space
           <ul class="assert">
@@ -160,7 +160,7 @@
       <tr id="list-style-020-4.1.1" class="primary">
         <td><strong>
             <a href="list-style-020.xht">list-style-020</a></strong></td>
-        <td></td>
+        <td><a href="reference/list-style-020-ref.xht">=</a> </td>
         <td></td>
         <td>'list-style' shorthand and 'none' values
           <ul class="assert">
@@ -179,7 +179,7 @@
       <tr id="whitespace-001-4.1.1" class="primary">
         <td><strong>
             <a href="whitespace-001.xht">whitespace-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
         <td></td>
         <td>White space - em-space (U+2003)
           <ul class="assert">
@@ -190,7 +190,7 @@
       <tr id="whitespace-002-4.1.1" class="primary">
         <td><strong>
             <a href="whitespace-002.xht">whitespace-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
         <td></td>
         <td>White space - ideographic space (U+3000)
           <ul class="assert">
@@ -213,7 +213,7 @@
       <tr id="keywords-000-4.1.2" class="primary">
         <td><strong>
             <a href="keywords-000.xht">keywords-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Keywords v. Strings (background)
         </td>
@@ -221,7 +221,7 @@
       <tr id="keywords-001-4.1.2" class="primary">
         <td><strong>
             <a href="keywords-001.xht">keywords-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/keywords-001-ref.xht">=</a> </td>
         <td></td>
         <td>Keywords v. Strings (width)
         </td>
@@ -269,7 +269,7 @@
       <tr id="case-sensitive-000-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-000.xht">case-sensitive-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of Properties and Keywords (background)
         </td>
@@ -277,7 +277,7 @@
       <tr id="case-sensitive-001-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-001.xht">case-sensitive-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of At-rules (@media)
         </td>
@@ -285,7 +285,7 @@
       <tr id="case-sensitive-003-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-003.xht">case-sensitive-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of pseudo-classes and pseudo-elements
           <ul class="assert">
@@ -296,7 +296,7 @@
       <tr id="case-sensitive-004-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-004.xht">case-sensitive-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of :lang() arguments
           <ul class="assert">
@@ -307,7 +307,7 @@
       <tr id="case-sensitive-005-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-005.xht">case-sensitive-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-005-ref.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of counter names
           <ul class="assert">
@@ -318,7 +318,7 @@
       <tr id="case-sensitive-007-4.1.3" class="primary nonHTML">
         <td><strong>
             <a href="case-sensitive-007.xht">case-sensitive-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
         <td></td>
         <td>Case sensitivity with element selectors
           <ul class="assert">
@@ -472,7 +472,7 @@
       <tr id="escapes-000-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-000.xht">escapes-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/escapes-000-ref.xht">=</a> </td>
         <td></td>
         <td>Escaped Newline in String
         </td>
@@ -480,7 +480,7 @@
       <tr id="escapes-001-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-001.xht">escapes-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Escaped Quote Marks in String
         </td>
@@ -488,7 +488,7 @@
       <tr id="escapes-002-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-002.xht">escapes-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Invalid Punctuation Escapes
         </td>
@@ -496,7 +496,7 @@
       <tr id="escapes-003-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-003.xht">escapes-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Class and Keyword Letter Escapes
         </td>
@@ -504,7 +504,7 @@
       <tr id="escapes-004-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-004.xht">escapes-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Unicode Escapes
         </td>
@@ -512,7 +512,7 @@
       <tr id="escapes-005-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-005.xht">escapes-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Unicode Escapes and Case Insensitivity
         </td>
@@ -520,7 +520,7 @@
       <tr id="escapes-006-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-006.xht">escapes-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Incorrect Letter Escape (Class Selector)
         </td>
@@ -528,7 +528,7 @@
       <tr id="escapes-007-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-007.xht">escapes-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Space-terminated Unicode Escapes
         </td>
@@ -536,7 +536,7 @@
       <tr id="escapes-008-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-008.xht">escapes-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Space-terminated Character Escapes
         </td>
@@ -544,7 +544,7 @@
       <tr id="escapes-009-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-009.xht">escapes-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Characters and case: Escaping a character inside a keyword
           <ul class="assert">
@@ -555,7 +555,7 @@
       <tr id="escapes-010-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-010.xht">escapes-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unicode-escaped Braces
           <ul class="assert">
@@ -566,7 +566,7 @@
       <tr id="escapes-012-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-012.xht">escapes-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>CSS Parsing: Escaped keywords
         </td>
@@ -585,7 +585,7 @@
       <tr id="ident-000-4.1.3" class="primary">
         <td><strong>
             <a href="ident-000.xht">ident-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (a-z) as Classes and IDs
         </td>
@@ -593,7 +593,7 @@
       <tr id="ident-001-4.1.3" class="primary">
         <td><strong>
             <a href="ident-001.xht">ident-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs
         </td>
@@ -601,7 +601,7 @@
       <tr id="ident-002-4.1.3" class="primary">
         <td><strong>
             <a href="ident-002.xht">ident-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with _) as Classes and IDs
         </td>
@@ -609,7 +609,7 @@
       <tr id="ident-003-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-003.xht">ident-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Valid Identifiers (starting with -) as Classes and IDs
         </td>
@@ -617,7 +617,7 @@
       <tr id="ident-004-4.1.3" class="primary">
         <td><strong>
             <a href="ident-004.xht">ident-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with ideographic) as Classes and IDs
         </td>
@@ -625,7 +625,7 @@
       <tr id="ident-005-4.1.3" class="primary">
         <td><strong>
             <a href="ident-005.xht">ident-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including ideographic) as Classes and IDs
         </td>
@@ -633,7 +633,7 @@
       <tr id="ident-006-4.1.3" class="primary">
         <td><strong>
             <a href="ident-006.xht">ident-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escape) as Classes and IDs
         </td>
@@ -641,7 +641,7 @@
       <tr id="ident-007-4.1.3" class="primary">
         <td><strong>
             <a href="ident-007.xht">ident-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including escape) as Classes and IDs
         </td>
@@ -649,7 +649,7 @@
       <tr id="ident-008-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-008.xht">ident-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Identifiers (starting with digit) as Classes and IDs
         </td>
@@ -657,7 +657,7 @@
       <tr id="ident-009-4.1.3" class="primary">
         <td><strong>
             <a href="ident-009.xht">ident-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including digits) as Classes and IDs
         </td>
@@ -665,7 +665,7 @@
       <tr id="ident-010-4.1.3" class="primary">
         <td><strong>
             <a href="ident-010.xht">ident-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escape) as Classes and IDs
         </td>
@@ -673,7 +673,7 @@
       <tr id="ident-011-4.1.3" class="primary">
         <td><strong>
             <a href="ident-011.xht">ident-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including escapes) as Classes and IDs
         </td>
@@ -681,7 +681,7 @@
       <tr id="ident-012-4.1.3" class="primary">
         <td><strong>
             <a href="ident-012.xht">ident-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-012-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs
         </td>
@@ -689,7 +689,7 @@
       <tr id="ident-013-4.1.3" class="primary">
         <td><strong>
             <a href="ident-013.xht">ident-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escaped -) as Classes and IDs
         </td>
@@ -697,7 +697,7 @@
       <tr id="ident-020-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-020.xht">ident-020</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Identifiers (starting with double -) as Classes and IDs
         </td>
@@ -735,7 +735,7 @@
       <tr id="at-import-009-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-009.xht">at-import-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following a known but invalid @rule
           <ul class="assert">
@@ -746,7 +746,7 @@
       <tr id="at-import-010-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-010.xht">at-import-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following an invalid selector
           <ul class="assert">
@@ -757,7 +757,7 @@
       <tr id="at-import-011-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-011.xht">at-import-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following garbage
           <ul class="assert">
@@ -768,7 +768,7 @@
       <tr id="at-keywords-000-4.1.5" class="primary">
         <td><strong>
             <a href="at-keywords-000.xht">at-keywords-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -776,7 +776,7 @@
       <tr id="at-keywords-001-4.1.5" class="primary">
         <td><strong>
             <a href="at-keywords-001.xht">at-keywords-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -784,7 +784,7 @@
       <tr id="at-keywords-002-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-keywords-002.xht">at-keywords-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -792,7 +792,7 @@
       <tr id="at-rules-000-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-rules-000.xht">at-rules-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -800,7 +800,7 @@
       <tr id="at-rules-001-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-001.xht">at-rules-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -808,7 +808,7 @@
       <tr id="at-rules-002-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-002.xht">at-rules-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -816,7 +816,7 @@
       <tr id="at-rules-003-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-003.xht">at-rules-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -824,7 +824,7 @@
       <tr id="at-rules-004-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-004.xht">at-rules-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -832,7 +832,7 @@
       <tr id="import-000-4.1.5" class="primary invalid">
         <td><strong>
             <a href="import-000.xht">import-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -840,7 +840,7 @@
       <tr id="import-001-4.1.5" class="primary invalid">
         <td><strong>
             <a href="import-001.xht">import-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -863,7 +863,7 @@
       <tr id="blocks-001-4.1.6" class="primary invalid">
         <td><strong>
             <a href="blocks-001.xht">blocks-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/blocks-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Parsing nested blocks and strings in style blocks
           <ul class="assert">
@@ -963,7 +963,7 @@
       <tr id="escapes-011-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-011.xht">escapes-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>CSS Parsing: Escaped keywords
         </td>
@@ -971,7 +971,7 @@
       <tr id="escapes-013-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-013.xht">escapes-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/escapes-013-ref.xht">=</a> </td>
         <td></td>
         <td>Escaping and spaces with classes
         </td>
@@ -979,7 +979,7 @@
       <tr id="escapes-014-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-014.xht">escapes-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Escaping and spaces with declarations
         </td>
@@ -1276,7 +1276,7 @@
       <tr id="sgml-comments-000-4.1.9" class="primary">
         <td><strong>
             <a href="sgml-comments-000.xht">sgml-comments-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>SGML comments
           <ul class="assert">
@@ -1298,7 +1298,7 @@
       <tr id="sgml-comments-002-4.1.9" class="primary">
         <td><strong>
             <a href="sgml-comments-002.xht">sgml-comments-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/sgml-comments-002-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of CDO/CDC in stylesheets
         </td>
@@ -1447,7 +1447,7 @@
       <tr id="at-rule-013-4.2" class="primary invalid">
         <td><strong>
             <a href="at-rule-013.xht">at-rule-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/at-rule-013-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside @media blocks
           <ul class="assert">
@@ -1517,7 +1517,7 @@
       <tr id="core-syntax-001-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-001.xht">core-syntax-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-001-ref.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places
         </td>
@@ -1525,7 +1525,7 @@
       <tr id="core-syntax-002-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-002.xht">core-syntax-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-002-ref.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places
         </td>
@@ -1533,7 +1533,7 @@
       <tr id="core-syntax-003-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-003.xht">core-syntax-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places (with no whitespace)
         </td>
@@ -1541,7 +1541,7 @@
       <tr id="core-syntax-004-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-004.xht">core-syntax-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places (with no whitespace)
         </td>
@@ -1549,7 +1549,7 @@
       <tr id="core-syntax-006-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-006.xht">core-syntax-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-006-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1557,7 +1557,7 @@
       <tr id="core-syntax-007-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-007.xht">core-syntax-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-007-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1565,7 +1565,7 @@
       <tr id="core-syntax-008-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-008.xht">core-syntax-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1573,7 +1573,7 @@
       <tr id="counters-003-4.2" class="primary">
         <td><strong>
             <a href="counters-003.xht">counters-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter() function with no white space
           <ul class="assert">
@@ -1584,7 +1584,7 @@
       <tr id="counters-004-4.2" class="primary">
         <td><strong>
             <a href="counters-004.xht">counters-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with no white space and two function values
           <ul class="assert">
@@ -1595,7 +1595,7 @@
       <tr id="counters-005-4.2" class="primary">
         <td><strong>
             <a href="counters-005.xht">counters-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with no white space and three function values
           <ul class="assert">
@@ -1606,7 +1606,7 @@
       <tr id="counters-006-4.2" class="primary">
         <td><strong>
             <a href="counters-006.xht">counters-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter() function with white space
           <ul class="assert">
@@ -1617,7 +1617,7 @@
       <tr id="counters-007-4.2" class="primary">
         <td><strong>
             <a href="counters-007.xht">counters-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter() function with white space and two function values
           <ul class="assert">
@@ -1628,7 +1628,7 @@
       <tr id="counters-008-4.2" class="primary">
         <td><strong>
             <a href="counters-008.xht">counters-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with white space and two function values
           <ul class="assert">
@@ -1639,7 +1639,7 @@
       <tr id="counters-009-4.2" class="primary">
         <td><strong>
             <a href="counters-009.xht">counters-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with white space and three function values
           <ul class="assert">
@@ -1650,7 +1650,7 @@
       <tr id="counters-010-4.2" class="primary">
         <td><strong>
             <a href="counters-010.xht">counters-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-010-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() functions
           <ul class="assert">
@@ -1672,7 +1672,7 @@
       <tr id="declaration-001-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-001.xht">declaration-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing ':', value, part 1
         </td>
@@ -1680,7 +1680,7 @@
       <tr id="declaration-002-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-002.xht">declaration-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing ':', value, part 2
         </td>
@@ -1688,7 +1688,7 @@
       <tr id="declaration-003-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-003.xht">declaration-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing value, part 1
         </td>
@@ -1696,7 +1696,7 @@
       <tr id="declaration-004-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-004.xht">declaration-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing value, part 2
         </td>
@@ -1704,7 +1704,7 @@
       <tr id="declaration-005-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-005.xht">declaration-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration: unexpected tokens { }, part 1
         </td>
@@ -1712,7 +1712,7 @@
       <tr id="declaration-006-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-006.xht">declaration-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration: unexpected tokens { }, part 2
         </td>
@@ -1720,7 +1720,7 @@
       <tr id="declarations-009-4.2" class="primary invalid">
         <td><strong>
             <a href="declarations-009.xht">declarations-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/declarations-009-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside declaration blocks
           <ul class="assert">
@@ -1830,7 +1830,7 @@
       <tr id="font-family-invalid-characters-003-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -1841,7 +1841,7 @@
       <tr id="font-family-invalid-characters-004-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -1852,7 +1852,7 @@
       <tr id="font-family-invalid-characters-005-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -1863,7 +1863,7 @@
       <tr id="font-family-invalid-characters-006-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
@@ -1995,7 +1995,7 @@
       <tr id="matching-brackets-001-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-001.xht">matching-brackets-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for @rules
           <ul class="assert">
@@ -2006,7 +2006,7 @@
       <tr id="matching-brackets-002-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-002.xht">matching-brackets-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-002-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for declarations
           <ul class="assert">
@@ -2017,7 +2017,7 @@
       <tr id="matching-brackets-003-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-003.xht">matching-brackets-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for selectors
           <ul class="assert">
@@ -2036,7 +2036,7 @@
       <tr id="selectors-parsing-001-4.2" class="primary">
         <td><strong>
             <a href="selectors-parsing-001.xht">selectors-parsing-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/selectors-parsing-001-ref.xht">=</a> </td>
         <td></td>
         <td>CSS: Selector Parsing and Invalid Pseudo-Elements
         </td>
@@ -2044,7 +2044,7 @@
       <tr id="unterminated-string-001-4.2" class="primary invalid">
         <td><strong>
             <a href="unterminated-string-001.xht">unterminated-string-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Error handling of unterminated strings
           <ul class="assert">
@@ -2063,7 +2063,7 @@
       <tr id="uri-017-4.2" class="primary image invalid">
         <td><strong>
             <a href="uri-017.xht">uri-017</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-017-ref.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unclosed URI Token at EOF (in declaration)
           <ul class="assert">
@@ -2074,7 +2074,7 @@
       <tr id="uri-018-4.2" class="primary image invalid">
         <td><strong>
             <a href="uri-018.xht">uri-018</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unclosed URI Token at EOF (in @import)
           <ul class="assert">
@@ -2150,7 +2150,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.3.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/syndata.html#numbers">4.3.1 Integers and real numbers</a></th></tr>
-      <!-- 10 tests -->
+      <!-- 9 tests -->
       <tr id="numbers-units-001-4.3.1" class="primary invalid">
         <td><strong>
             <a href="numbers-units-001.xht">numbers-units-001</a></strong></td>
@@ -2187,7 +2187,7 @@
       <tr id="numbers-units-004-4.3.1" class="primary">
         <td><strong>
             <a href="numbers-units-004.xht">numbers-units-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
         <td></td>
         <td>Parsing integer numbers with '+'
           <ul class="assert">
@@ -2195,17 +2195,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="positive-integer-001-4.3.1" class="primary">
-        <td><strong>
-            <a href="positive-integer-001.xht">positive-integer-001</a></strong></td>
-        <td></td>
-        <td></td>
-        <td>Parsing signed integers
-          <ul class="assert">
-            <li>Positively signed integers are treated the same as non-signed integers.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="z-index-015-4.3.1" class="invalid">
         <td>
             <a href="z-index-015.xht">z-index-015</a></td>
@@ -2314,7 +2303,7 @@
       <tr id="c547-indent-000-4.3.2" class="ahem">
         <td>
             <a href="c547-indent-000.xht">c547-indent-000</a></td>
-        <td></td>
+        <td><a href="reference/c547-indent-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text-indent
         </td>
@@ -2338,7 +2327,7 @@
       <tr id="c5510-padn-000-4.3.2" class="ahem image">
         <td>
             <a href="c5510-padn-000.xht">c5510-padn-000</a></td>
-        <td></td>
+        <td><a href="reference/c5510-padn-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>padding
         </td>
@@ -2406,7 +2395,7 @@
       <tr id="numbers-units-006-4.3.2" class="primary invalid">
         <td><strong>
             <a href="numbers-units-006.xht">numbers-units-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unsupported negative values
           <ul class="assert">
@@ -2417,7 +2406,7 @@
       <tr id="numbers-units-007-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-007.xht">numbers-units-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-007-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em sizes
           <ul class="assert">
@@ -2428,7 +2417,7 @@
       <tr id="numbers-units-009-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-009.xht">numbers-units-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-009-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with the font-size set to px size
           <ul class="assert">
@@ -2439,7 +2428,7 @@
       <tr id="numbers-units-010-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-010.xht">numbers-units-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-010-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to inch
           <ul class="assert">
@@ -2450,7 +2439,7 @@
       <tr id="numbers-units-011-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-011.xht">numbers-units-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-011-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to em
           <ul class="assert">
@@ -2461,7 +2450,7 @@
       <tr id="numbers-units-012-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-012.xht">numbers-units-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-012-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to ex
           <ul class="assert">
@@ -2472,7 +2461,7 @@
       <tr id="numbers-units-013-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-013.xht">numbers-units-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-013-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to percentage
           <ul class="assert">
@@ -2483,7 +2472,7 @@
       <tr id="numbers-units-015-4.3.2" class="primary ahem should">
         <td><strong>
             <a href="numbers-units-015.xht">numbers-units-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-014-ref-a.xht">=</a> <a href="reference/numbers-units-014-ref-b.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="should" title="Behavior tested is recommended but not required">Recommend</abbr></td>
         <td>Height of EX
           <ul class="assert">
@@ -2494,7 +2483,7 @@
       <tr id="numbers-units-018-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-018.xht">numbers-units-018</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-018-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Specifying em/ex on the root element
           <ul class="assert">
@@ -2505,7 +2494,7 @@
       <tr id="numbers-units-019-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-019.xht">numbers-units-019</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-019-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>First available font defines the 'ex' unit size
           <ul class="assert">
@@ -2516,7 +2505,7 @@
       <tr id="numbers-units-021-4.3.2" class="primary 96dpi ahem">
         <td><strong>
             <a href="numbers-units-021.xht">numbers-units-021</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-021-ref.xht">=</a> </td>
         <td><abbr class="96dpi" title="Only valid on 96dpi displays">96</abbr><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Root element and the 'em' unit size
           <ul class="assert">
@@ -2589,7 +2578,7 @@
       <tr id="units-005-4.3.2" class="primary">
         <td><strong>
             <a href="units-005.xht">units-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/units-005-ref.xht">=</a> </td>
         <td></td>
         <td>Units: em (0.87em floats)
         </td>
@@ -2745,7 +2734,7 @@
       <tr id="uri-004-4.3.4" class="primary image">
         <td><strong>
             <a href="uri-004.xht">uri-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>URL function with URI that has escaped special chars
           <ul class="assert">
@@ -2756,7 +2745,7 @@
       <tr id="uri-005-4.3.4" class="primary image">
         <td><strong>
             <a href="uri-005.xht">uri-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>URL function with escaped special chars - single quote
           <ul class="assert">
@@ -2833,7 +2822,7 @@
       <tr id="uri-012-4.3.4" class="primary invalid">
         <td><strong>
             <a href="uri-012.xht">uri-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-012-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Error handling of broken url() - balancing braces
         </td>
@@ -2841,7 +2830,7 @@
       <tr id="uri-014-4.3.4" class="primary">
         <td><strong>
             <a href="uri-014.xht">uri-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Unquoted commas in url()
           <ul class="assert">
@@ -2852,7 +2841,7 @@
       <tr id="uri-015-4.3.4" class="primary">
         <td><strong>
             <a href="uri-015.xht">uri-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Escaped url() functional notation
           <ul class="assert">
@@ -2863,7 +2852,7 @@
       <tr id="uri-016-4.3.4" class="primary">
         <td><strong>
             <a href="uri-016.xht">uri-016</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-016-ref.xht">=</a> </td>
         <td></td>
         <td>Error handling of broken url() with open /*
           <ul class="assert">
@@ -2883,7 +2872,7 @@
       <tr id="content-counter-000-4.3.5" class="">
         <td>
             <a href="content-counter-000.xht">content-counter-000</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -2891,7 +2880,7 @@
       <tr id="content-counter-001-4.3.5" class="">
         <td>
             <a href="content-counter-001.xht">content-counter-001</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -2899,7 +2888,7 @@
       <tr id="content-counter-002-4.3.5" class="">
         <td>
             <a href="content-counter-002.xht">content-counter-002</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -2907,7 +2896,7 @@
       <tr id="content-counter-003-4.3.5" class="">
         <td>
             <a href="content-counter-003.xht">content-counter-003</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -2915,7 +2904,7 @@
       <tr id="content-counter-004-4.3.5" class="">
         <td>
             <a href="content-counter-004.xht">content-counter-004</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -2923,7 +2912,7 @@
       <tr id="content-counter-005-4.3.5" class="">
         <td>
             <a href="content-counter-005.xht">content-counter-005</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -2931,7 +2920,7 @@
       <tr id="content-counter-006-4.3.5" class="">
         <td>
             <a href="content-counter-006.xht">content-counter-006</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -2939,7 +2928,7 @@
       <tr id="content-counter-007-4.3.5" class="">
         <td>
             <a href="content-counter-007.xht">content-counter-007</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -2947,7 +2936,7 @@
       <tr id="content-counter-008-4.3.5" class="">
         <td>
             <a href="content-counter-008.xht">content-counter-008</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -2955,7 +2944,7 @@
       <tr id="content-counter-009-4.3.5" class="">
         <td>
             <a href="content-counter-009.xht">content-counter-009</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -2963,7 +2952,7 @@
       <tr id="content-counter-010-4.3.5" class="">
         <td>
             <a href="content-counter-010.xht">content-counter-010</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -2971,7 +2960,7 @@
       <tr id="content-counter-011-4.3.5" class="">
         <td>
             <a href="content-counter-011.xht">content-counter-011</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -2979,7 +2968,7 @@
       <tr id="content-counter-012-4.3.5" class="">
         <td>
             <a href="content-counter-012.xht">content-counter-012</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -2987,7 +2976,7 @@
       <tr id="content-counter-013-4.3.5" class="">
         <td>
             <a href="content-counter-013.xht">content-counter-013</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -2995,7 +2984,7 @@
       <tr id="content-counter-014-4.3.5" class="">
         <td>
             <a href="content-counter-014.xht">content-counter-014</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -3003,7 +2992,7 @@
       <tr id="content-counter-015-4.3.5" class="">
         <td>
             <a href="content-counter-015.xht">content-counter-015</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -3011,7 +3000,7 @@
       <tr id="content-counter-016-4.3.5" class="invalid">
         <td>
             <a href="content-counter-016.xht">content-counter-016</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
@@ -3367,7 +3356,7 @@
       <tr id="color-000-4.3.6" class="primary invalid">
         <td><strong>
             <a href="color-000.xht">color-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/color-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>RGB color syntax error handling
         </td>
@@ -3430,7 +3419,7 @@
       <tr id="colors-006-4.3.6" class="primary">
         <td><strong>
             <a href="colors-006.xht">colors-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/colors-006-ref.xht">=</a> </td>
         <td></td>
         <td>Comparing color keywords and hex values
           <ul class="assert">
@@ -3461,7 +3450,7 @@
       <tr id="escaped-newline-001-4.3.7" class="primary">
         <td><strong>
             <a href="escaped-newline-001.xht">escaped-newline-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/escaped-newline-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing strings with escaped newlines
           <ul class="assert">
@@ -3472,7 +3461,7 @@
       <tr id="quoted-string-001-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-001.xht">quoted-string-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of single quotes inside double quotes
           <ul class="assert">
@@ -3483,7 +3472,7 @@
       <tr id="quoted-string-002-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-002.xht">quoted-string-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of double quotes inside single quotes
           <ul class="assert">
@@ -3494,7 +3483,7 @@
       <tr id="quoted-string-003-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-003.xht">quoted-string-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of escaped quotes (single within single)
           <ul class="assert">
@@ -3505,7 +3494,7 @@
       <tr id="quoted-string-004-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-004.xht">quoted-string-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of escaped double quotes
           <ul class="assert">
@@ -3516,7 +3505,7 @@
       <tr id="strings-000-4.3.7" class="primary">
         <td><strong>
             <a href="strings-000.xht">strings-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Newlines in strings
         </td>
@@ -3542,7 +3531,7 @@
       <tr id="at-charset-001-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-001.xht">at-charset-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP Charset vs BOM
           <ul class="assert">
@@ -3553,7 +3542,7 @@
       <tr id="at-charset-002-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-002.xht">at-charset-002</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP Charset over @charset
           <ul class="assert">
@@ -3564,7 +3553,7 @@
       <tr id="at-charset-003-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-003.xht">at-charset-003</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over link charset
           <ul class="assert">
@@ -3575,7 +3564,7 @@
       <tr id="at-charset-004-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-004.xht">at-charset-004</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over set referring code page (UTF-8)
           <ul class="assert">
@@ -3586,7 +3575,7 @@
       <tr id="at-charset-005-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-005.xht">at-charset-005</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over set referring code page (windows-1252)
           <ul class="assert">
@@ -3597,7 +3586,7 @@
       <tr id="at-charset-006-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-006.xht">at-charset-006</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over referring code page (not set)
           <ul class="assert">
@@ -3608,7 +3597,7 @@
       <tr id="at-charset-007-4.4" class="primary">
         <td><strong>
             <a href="at-charset-007.xht">at-charset-007</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset over link charset attribute
           <ul class="assert">
@@ -3619,7 +3608,7 @@
       <tr id="at-charset-008-4.4" class="primary">
         <td><strong>
             <a href="at-charset-008.xht">at-charset-008</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset over referring document's code page (set)
           <ul class="assert">
@@ -3630,7 +3619,7 @@
       <tr id="at-charset-009-4.4" class="primary">
         <td><strong>
             <a href="at-charset-009.xht">at-charset-009</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset over referring document's code page (unset)
           <ul class="assert">
@@ -3641,7 +3630,7 @@
       <tr id="at-charset-010-4.4" class="primary">
         <td><strong>
             <a href="at-charset-010.xht">at-charset-010</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Link charset attribute over referring document's codepage (set)
           <ul class="assert">
@@ -3652,7 +3641,7 @@
       <tr id="at-charset-011-4.4" class="primary">
         <td><strong>
             <a href="at-charset-011.xht">at-charset-011</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Link charset attribute over referring document's codepage (not set)
           <ul class="assert">
@@ -3663,7 +3652,7 @@
       <tr id="at-charset-012-4.4" class="primary">
         <td><strong>
             <a href="at-charset-012.xht">at-charset-012</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Stylesheet encoding via the referring document's encoding (set)
           <ul class="assert">
@@ -3674,7 +3663,7 @@
       <tr id="at-charset-014-4.4" class="primary">
         <td><strong>
             <a href="at-charset-014.xht">at-charset-014</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-8)
           <ul class="assert">
@@ -3685,7 +3674,7 @@
       <tr id="at-charset-015-4.4" class="primary">
         <td><strong>
             <a href="at-charset-015.xht">at-charset-015</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-16 LE)
           <ul class="assert">
@@ -3696,7 +3685,7 @@
       <tr id="at-charset-016-4.4" class="primary">
         <td><strong>
             <a href="at-charset-016.xht">at-charset-016</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-16 BE)
           <ul class="assert">
@@ -3707,7 +3696,7 @@
       <tr id="at-charset-019-4.4" class="primary">
         <td><strong>
             <a href="at-charset-019.xht">at-charset-019</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-8)
           <ul class="assert">
@@ -3718,7 +3707,7 @@
       <tr id="at-charset-020-4.4" class="primary">
         <td><strong>
             <a href="at-charset-020.xht">at-charset-020</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-16LE)
           <ul class="assert">
@@ -3729,7 +3718,7 @@
       <tr id="at-charset-021-4.4" class="primary">
         <td><strong>
             <a href="at-charset-021.xht">at-charset-021</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-16BE)
           <ul class="assert">
@@ -3740,7 +3729,7 @@
       <tr id="at-charset-024-4.4" class="primary">
         <td><strong>
             <a href="at-charset-024.xht">at-charset-024</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (windows-1252)
           <ul class="assert">
@@ -3751,7 +3740,7 @@
       <tr id="at-charset-025-4.4" class="primary">
         <td><strong>
             <a href="at-charset-025.xht">at-charset-025</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (Shift-JIS)
           <ul class="assert">
@@ -3762,7 +3751,7 @@
       <tr id="at-charset-026-4.4" class="primary">
         <td><strong>
             <a href="at-charset-026.xht">at-charset-026</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (ISO-8859-6)
           <ul class="assert">
@@ -3773,7 +3762,7 @@
       <tr id="at-charset-027-4.4" class="primary">
         <td><strong>
             <a href="at-charset-027.xht">at-charset-027</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (Big5)
           <ul class="assert">
@@ -3784,7 +3773,7 @@
       <tr id="at-charset-028-4.4" class="primary">
         <td><strong>
             <a href="at-charset-028.xht">at-charset-028</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-8)
           <ul class="assert">
@@ -3795,7 +3784,7 @@
       <tr id="at-charset-029-4.4" class="primary">
         <td><strong>
             <a href="at-charset-029.xht">at-charset-029</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-16LE)
           <ul class="assert">
@@ -3806,7 +3795,7 @@
       <tr id="at-charset-030-4.4" class="primary">
         <td><strong>
             <a href="at-charset-030.xht">at-charset-030</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-16BE)
           <ul class="assert">
@@ -3894,7 +3883,7 @@
       <tr id="at-charset-040-4.4" class="primary">
         <td><strong>
             <a href="at-charset-040.xht">at-charset-040</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Non-matching @charset (UTF-16BE with UTF-8 @charset)
           <ul class="assert">
@@ -3905,7 +3894,7 @@
       <tr id="at-charset-041-4.4" class="primary">
         <td><strong>
             <a href="at-charset-041.xht">at-charset-041</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Non-matching @charset (UTF-32LE with UTF-16BE @charset)
           <ul class="assert">
@@ -3916,7 +3905,7 @@
       <tr id="at-charset-042-4.4" class="primary">
         <td><strong>
             <a href="at-charset-042.xht">at-charset-042</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3927,7 +3916,7 @@
       <tr id="at-charset-043-4.4" class="primary">
         <td><strong>
             <a href="at-charset-043.xht">at-charset-043</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)
           <ul class="assert">
@@ -3938,7 +3927,7 @@
       <tr id="at-charset-044-4.4" class="primary">
         <td><strong>
             <a href="at-charset-044.xht">at-charset-044</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3949,7 +3938,7 @@
       <tr id="at-charset-045-4.4" class="primary">
         <td><strong>
             <a href="at-charset-045.xht">at-charset-045</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3960,7 +3949,7 @@
       <tr id="at-charset-046-4.4" class="primary">
         <td><strong>
             <a href="at-charset-046.xht">at-charset-046</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)
           <ul class="assert">
@@ -3971,7 +3960,7 @@
       <tr id="at-charset-047-4.4" class="primary">
         <td><strong>
             <a href="at-charset-047.xht">at-charset-047</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Endianness not specified (UTF-16LE encoding with UTF-16 @charset)
           <ul class="assert">
@@ -3982,7 +3971,7 @@
       <tr id="at-charset-048-4.4" class="primary">
         <td><strong>
             <a href="at-charset-048.xht">at-charset-048</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Endianness not specified (UTF-16BE encoding with UTF-16 @charset)
           <ul class="assert">
@@ -4048,7 +4037,7 @@
       <tr id="at-charset-054-4.4" class="primary">
         <td><strong>
             <a href="at-charset-054.xht">at-charset-054</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td></td>
         <td>@charset in uppercase
           <ul class="assert">
@@ -4070,7 +4059,7 @@
       <tr id="at-charset-056-4.4" class="primary">
         <td><strong>
             <a href="at-charset-056.xht">at-charset-056</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td></td>
         <td>@charset missing a space
           <ul class="assert">
@@ -4114,7 +4103,7 @@
       <tr id="at-charset-060-4.4" class="primary">
         <td><strong>
             <a href="at-charset-060.xht">at-charset-060</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset with bogus name
           <ul class="assert">
@@ -4125,7 +4114,7 @@
       <tr id="at-charset-061-4.4" class="primary">
         <td><strong>
             <a href="at-charset-061.xht">at-charset-061</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td></td>
         <td>@charset within style block
           <ul class="assert">
@@ -4136,7 +4125,7 @@
       <tr id="at-charset-071-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-071.xht">at-charset-071</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-1
         </td>
@@ -4144,7 +4133,7 @@
       <tr id="at-charset-072-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-072.xht">at-charset-072</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-11
         </td>
@@ -4152,7 +4141,7 @@
       <tr id="at-charset-073-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-073.xht">at-charset-073</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-5
         </td>
@@ -4160,7 +4149,7 @@
       <tr id="at-charset-074-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-074.xht">at-charset-074</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-6
         </td>
@@ -4168,7 +4157,7 @@
       <tr id="at-charset-075-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-075.xht">at-charset-075</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-7
         </td>
@@ -4176,7 +4165,7 @@
       <tr id="at-charset-076-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-076.xht">at-charset-076</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-8
         </td>
@@ -4184,7 +4173,7 @@
       <tr id="at-charset-077-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-077.xht">at-charset-077</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: KOI8-R
         </td>
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 08c227e29e2..0461a17a3bf 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
@@ -35,7 +35,7 @@
       <tr id="cascade-import-dynamic-001-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-001.xht">cascade-import-dynamic-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet append (&lt;style&gt;)
         </td>
@@ -43,7 +43,7 @@
       <tr id="cascade-import-dynamic-002-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-002.xht">cascade-import-dynamic-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet append (&lt;link&gt;)
         </td>
@@ -51,7 +51,7 @@
       <tr id="cascade-import-dynamic-003-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-003.xht">cascade-import-dynamic-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet insertion (&lt;style&gt;)
         </td>
@@ -59,7 +59,7 @@
       <tr id="cascade-import-dynamic-004-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-004.xht">cascade-import-dynamic-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet insertion (&lt;link&gt;)
         </td>
@@ -67,7 +67,7 @@
       <tr id="cascade-import-dynamic-005-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-005.xht">cascade-import-dynamic-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet deletion (&lt;style&gt;)
         </td>
@@ -75,7 +75,7 @@
       <tr id="cascade-import-dynamic-006-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-006.xht">cascade-import-dynamic-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet deletion (&lt;link&gt;)
         </td>
@@ -83,7 +83,7 @@
       <tr id="cascade-import-dynamic-control-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-control.xht">cascade-import-dynamic-control</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Control test
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-7.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-7.xht
index 17abc885233..d7bd96b3edd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-7.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-7.xht
@@ -246,7 +246,7 @@
       <tr id="at-rule-013-7.2.1" class="invalid">
         <td>
             <a href="at-rule-013.xht">at-rule-013</a></td>
-        <td></td>
+        <td><a href="reference/at-rule-013-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside @media blocks
           <ul class="assert">
@@ -257,7 +257,7 @@
       <tr id="matching-brackets-001-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-001.xht">matching-brackets-001</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for @rules
           <ul class="assert">
@@ -268,7 +268,7 @@
       <tr id="matching-brackets-002-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-002.xht">matching-brackets-002</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-002-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for declarations
           <ul class="assert">
@@ -279,7 +279,7 @@
       <tr id="matching-brackets-003-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-003.xht">matching-brackets-003</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for selectors
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-8.xht b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-8.xht
index 280c5ee0b5e..2bd4253618a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-8.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-8.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Box model (2326 tests)</h2>
+  <h2>Box model (2327 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -8352,7 +8352,7 @@
       <tr id="c5510-padn-000-8.4" class="ahem image">
         <td>
             <a href="c5510-padn-000.xht">c5510-padn-000</a></td>
-        <td></td>
+        <td><a href="reference/c5510-padn-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>padding
         </td>
@@ -45557,7 +45557,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s8.6">+</a>
         <a href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model">8.6 The box model for inline elements in bidirectional context</a></th></tr>
-      <!-- 80 tests -->
+      <!-- 81 tests -->
       <tr id="bidi-001-8.6" class="">
         <td>
             <a href="bidi-001.xht">bidi-001</a></td>
@@ -45591,6 +45591,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-8.6" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-8.6" class="">
         <td>
             <a href="bidi-005.xht">bidi-005</a></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 56d64f8ca1b..e8e18e40880 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 (1245 tests)</h2>
+  <h2>Visual formatting model (1246 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -17418,7 +17418,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s9.10">+</a>
         <a href="http://www.w3.org/TR/CSS21/visuren.html#direction">9.10 Text direction: the 'direction' and 'unicode-bidi' properties</a></th></tr>
-      <!-- 118 tests -->
+      <!-- 119 tests -->
       <tr id="bidi-001-9.10" class="">
         <td>
             <a href="bidi-001.xht">bidi-001</a></td>
@@ -17452,6 +17452,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-9.10" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-9.10" class="">
         <td>
             <a href="bidi-005.xht">bidi-005</a></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/color-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/color-000.xht
index 4573bf8f4d4..d75d3846533 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/color-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/color-000.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#color-units"/>
+  <link rel="match" href="reference/color-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p.correct { color: red }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/colors-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/colors-006.xht
index 78eb6ff94be..e0d5e5a5d10 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/colors-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/colors-006.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Comparing color keywords and hex values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#color-units" />
+        <link rel="match" href="reference/colors-006-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Color matching of keywords and hex values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-000.xht
index 74271f1dcce..a94f6657d51 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-000.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-000-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-001.xht
index 27150eb7d67..3ccfd4f9f10 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-001.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-001-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-002.xht
index 4e5112b115d..88d0c41d48a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-002.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-002-ref.xht"/>
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-003.xht
index 66aeeaba721..1fe7a406fcd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-003.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-003-ref.xht"/>
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-004.xht
index f8505f320bf..10bc98166b4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-004.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-004-ref.xht"/>
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-005.xht
index 9e8fabfd7c9..abebe878eb7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-005.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-000-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-006.xht
index d5e1e6b8213..617c110600a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-006.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-006-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-007.xht
index f19aabac4db..4ac72df0e32 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-007.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-007-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-008.xht
index 77d188a25bd..ee0d87abc52 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-008.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-008-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-009.xht
index fb0b2f52aa8..31e5e2f4a90 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-009.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-009-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-010.xht
index 388e07eeb22..6e67abb94b6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-010.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-010-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-011.xht
index 7b62cc4330c..45bb3e7f95a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-011.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-011-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-012.xht
index d7aea13da9a..3c4890ba838 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-012.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-011-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-013.xht
index 65a62f92bcf..0367924d689 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-013.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-013-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-014.xht
index d180f34f92f..2be92cacdee 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-014.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-013-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-015.xht
index 9de4e7ee5c3..b0dbd2920db 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-015.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-015-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-016.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-016.xht
index e823afa9546..6a277a8c50b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-016.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counter-016.xht
@@ -6,6 +6,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
@@ -20,7 +21,6 @@
     content: counter(f, ".", decimal);
     content: counter(f, decimal, ".");
     content: counter(f, decimal, decimal);
-    content: counter(f, unknowntype);
   }
 
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/content-counters-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1/content-counters-018.xht
index c6ff311ba2d..63f79ed08a1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/content-counters-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/content-counters-018.xht
@@ -21,7 +21,6 @@
     content: counters(f, decimal, ".");
     content: counters(f, ".", decimal, decimal);
     content: counters(f, ".", decimal, ".");
-    content: counters(f, ".", unknowntype);
   }
 
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-001.xht
index 6c10aa310f1..3b806bdb32e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-001.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-001-ref.xht" />
   <style type="text/css">
    .test { color: green; }
    .test { test { :nested; color: yellow; background: red; }: not-nested; text-decoration: underline; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-002.xht
index 1d6d1dad373..8f477fb9ecf 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-002.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-002-ref.xht" />
   <style type="text/css">
    .instruct { color: black; background: white; }
    p {
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-003.xht
index 8ff4ac2d426..e5b5dede82e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-003.xht
@@ -5,9 +5,10 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/003.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">p{color:green;/*no"}"*/span{color:yellow;background:red;}.test{color:maroon;background:yellow;}}</style>
  </head>
  <body>
-  <p>This line <span>should</span> be <span class="test">all green</span>.</p>
+  <p>This text <span>should</span> be <span class="test">green</span>.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-004.xht
index d1d39e165b3..7db2c0da8ed 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-004.xht
@@ -5,12 +5,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002-demo.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">
  body { color : green ; p{color : red ; }
  span { color : red ; }
   </style>
  </head>
  <body>
-  <p>This <span>sentence</span> should be <span>green</span>.</p>
+  <p>This <span>text</span> should be <span>green</span>.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-006.xht
index 7f5f377966b..c648971a6e0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-006.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/006.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-006-ref.xht" />
   <style type="text/css">
    body { color: green; }
    p { background: red ! fail; color: yellow ! fail }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-007.xht
index 29136455d95..4a9ab5152e5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-007.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/007.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-007-ref.xht" />
   <style type="text/css">
    body { font-size: 200px; }
    p { font-size: 16px; font-size: 200!invalid; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-008.xht
index dedd0695735..65c57e7d862 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-008.xht
@@ -5,12 +5,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/008.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">
    body { color: green; }
    p { color: 1111ff; }
   </style>
  </head>
  <body>
-  <p>This line should be green.</p>
+  <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-009.xht
index 3c8104c0c8c..fe245db5df2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/core-syntax-009.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Syntactic White Space</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="assert" content="Only the characters U+0020, U+0009, U+000A,     U+000D, and U+000C are considered white space."/>
   <style type="text/css">
     @import "support/core-syntax-009.css";
@@ -20,7 +21,7 @@
  </head>
  <body>
   <div>
-   <p>This sentence must be green.</p>
+   <p>This text should be green.</p>
   </div>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-001.xht
index 447a83dd741..9a2d557e867 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter functions with just the identifier</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html" />
+        <link rel="match" href="reference/counters-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Counters can be referred to using only the identifier." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-003.xht
index d4952bd7ee0..f3fa4ccdcb9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-003.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter() function with no white space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counter function can be parsed with no white space separating the function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-004.xht
index efe2cd4f615..6dc6d383a76 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-004.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with no white space and two function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with no white space separating the two function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-005.xht
index c5698b31967..c6235223613 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-005.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with no white space and three function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with no white space separating the three function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-006.xht
index ccb33ed6744..42a5fae6a92 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-006.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter() function with white space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counter function can be parsed with white space separating the function value." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-007.xht
index 31ce723b207..3a39516f94b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-007.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counter() function with white space and two function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counter function can be parsed with white space separating the two function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-008.xht
index 7335893acdc..0b09acf6f5b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-008.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with white space and two function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with white space separating the two function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-009.xht
index 672e44c46ba..ee56c44acc8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-009.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() function with white space and three function values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with white space separating the three function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/counters-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/counters-010.xht
index 50f497e51ab..fd591ee21a3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/counters-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/counters-010.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing counters() functions</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-010-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="To refer to a sequence of nested counters of the same name, the notation is 'counters(identifier, string)' or 'counters(identifier, string, list-style-type)'." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-001.xht
index ab391e42eca..50916699932 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-001.xht
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing ':', value, part 1</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:green; color }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-002.xht
index 1c1c3f2b39c..73ad7870726 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-002.xht
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing ':', value, part 2</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:red;   color; color:green }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-003.xht
index 48ae81f0498..9cbea1f0bc6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-003.xht
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing value, part 1</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:green; color: }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-004.xht
index ff718f905bd..4fa769b8fe9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-004.xht
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration missing value, part 2</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:red; color:; color:green }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-005.xht
index 8e0d7e22657..04600082ef0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-005.xht
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration: unexpected tokens { }, part 1</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:green; color{;color:maroon} } 
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-006.xht
index f9a6519a11d..f13b74b9c4a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declaration-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declaration-006.xht
@@ -4,12 +4,13 @@
   <title>CSS Test: malformed declaration: unexpected tokens { }, part 2</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:red; color{;color:maroon}; color:green } 
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/declarations-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/declarations-009.xht
index b0c7e65bcf0..513de74bc2e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/declarations-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/declarations-009.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Ignoring at-rules inside declaration blocks</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/declarations-009-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="At-rules inside declaration blocks are parsed as malformed declarations."/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escaped-newline-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escaped-newline-001.xht
index 2e4685fa78b..6d7dc8ee379 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escaped-newline-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escaped-newline-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing strings with escaped newlines</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings" />
+        <link rel="match" href="reference/escaped-newline-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Strings with escaped newlines are treated as a single whole string." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-000.xht
index f522bb2d758..ae7d414e758 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Escaped Newline in String</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/escapes-000-ref.xht"/>
   <style type="text/css">
 
   p.one:before { content: "This "; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-001.xht
index 85c702b9a2d..886185e5f15 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Escaped Quote Marks in String</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-002.xht
index 275a566b118..f41bc9bcc18 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-002.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Punctuation Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class#id { background: green; color: white; }
@@ -23,7 +24,7 @@
  </head>
  <body>
 
- <p class="class" id="id">This paragraph should have a green background.</p>
+ <p class="class" id="id">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/escapes-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-003.xht
index 3cd9f982154..5b72a0330e7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-003.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Class and Keyword Letter Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-004.xht
index a51490c5051..beeccf6e23d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-004.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Unicode Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-005.xht
index f6552566a6d..2eb9a4d3c39 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-005.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Unicode Escapes and Case Insensitivity</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-006.xht
index 31fbe5fc632..b7e4dcae1f8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-006.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Incorrect Letter Escape (Class Selector)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: green; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-007.xht
index 60ba65f592c..bb7539f40ca 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-007.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Space-terminated Unicode Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-008.xht
index 81d7b3988ff..d74c6f7ab11 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-008.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Space-terminated Character Escapes</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-009.xht
index 1b78b801de1..ec3eb887eda 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-009.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Characters and case: Escaping a character inside a keyword</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="Browsers should be able to ignore the keyword"/>
 <style type="text/css">
@@ -12,6 +13,6 @@ p {color: r\ed}
 </style>
  </head>
  <body>
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-010.xht
index ed32d962328..b38fb35114b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-010.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Unicode-escaped Braces</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="Unicode escapes cannot substitute for '{' or '}' in CSS syntax."/>
 <style type="text/css">
@@ -14,6 +15,6 @@ p \7B color: red \7D
 </style>
  </head>
  <body>
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-011.xht
index 6661e45c78e..a830ffbf76c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-011.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/quotes/001.xml" type="application/xhtml+xml"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
    p { color: green; color: \r\e\d; } /* '\r\e\d' is 'r^N^M', which isn't valid */
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-012.xht
index 5114a922f71..7881569e66e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-012.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/quotes/002.xml" type="application/xhtml+xml"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
    p { color: red; color: \g\r\45\65\n; } /* 'grEen' */
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-013.xht
index 74ca6d43b3b..b593e9625ad 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-013.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/escaping/003.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets" />
+  <link rel="match" href="reference/escapes-013-ref.xht" />
   <style type="text/css">
    .css\0031 p { color: yellow; background: red; }
    .css\0032 p { color: white; background: green; }
@@ -12,6 +13,6 @@
  </head>
  <body>
   <div class="css1"><p>This line should be unstyled.</p></div>
-  <p class="css2p">This line should be green.</p>
+  <p class="css2p">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/escapes-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-014.xht
index 3f9de532b98..6ecaab7f0c5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/escapes-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/escapes-014.xht
@@ -5,12 +5,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/escaping/004.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <style type="text/css">
    .test { color: white; background: green; }
    .test { color:\0020yellow; background:\0020red; }
   </style>
  </head>
  <body>
-  <p class="test">This line should be green.</p>
+  <p class="test">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/first-page-vrl-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/first-page-vrl-002.xht
index 1c4a848e738..4a4fb3ac320 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/first-page-vrl-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/first-page-vrl-002.xht
@@ -1,16 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!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>
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
   <title>CSS Writing Modes Test: first page of a document with vertical-rl writing-mode</title>
 
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property"/>
-  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages"/>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages" />
 
-  <meta content="image paged" name="flags"/>
-  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert"/>
+  <meta content="image paged" name="flags" />
+  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert" />
 
   <style type="text/css" media="print"><![CDATA[
   html
@@ -40,7 +40,7 @@
 
  <body>
 
-  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled"/></p>
+  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled" /></p>
 
   <!--
   The image says:
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-003.xht
index 110298f1f3b..99ecc4f1f12 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-003.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-004.xht
index 929c75d751e..d12b777caa0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-004.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-005.xht
index 76890af01c5..c6ba048b6be 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-005.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-005-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-006.xht
index ca42ac700fa..0049710c1e3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/font-family-invalid-characters-006.xht
@@ -8,6 +8,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-006-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-000.xht
index 9b35d861ecf..7696762b7b1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (a-z) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-001.xht
index 986083d1383..e6e1b339cf7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-002.xht
index 5dc2710c9c5..7639f6c853c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-002.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with _) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-003.xht
index 98a66da0287..869efbb1b4b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-003.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="author" title="Ray Kiddy" href="mailto:ray@ganymede.org"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-004.xht
index 4fa5c77f780..59e027514cf 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-004.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with ideographic) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-005.xht
index 4ed9b2baa67..5f1cbabcefd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-005.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including ideographic) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-006.xht
index fddc0bcef12..6dd5a923dc2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-006.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escape) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-007.xht
index 2c910cd239c..b175f4d6e7b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-007.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including escape) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-008.xht
index 275c3b5de86..9d3bdcf33e9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-008.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Identifiers (starting with digit) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-009.xht
index ee1e44d9888..29678a7b44d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-009.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including digits) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-010.xht
index a1a3764bd5f..afdac6f595d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-010.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escape) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-011.xht
index f33d974c7b9..ac644ce967b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-011.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (including escapes) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-012.xht
index ffb5096e362..6f86909e008 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-012.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-012-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-013.xht
index 4c0196e043a..900ed8cf842 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-013.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Valid Identifiers (starting with escaped -) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/ident-020.xht b/tests/wpt/css-tests/css21_dev/xhtml1/ident-020.xht
index 264377b57b9..e929a7647e8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/ident-020.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/ident-020.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Invalid Identifiers (starting with double -) as Classes and IDs</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
 
   <meta name="flags" content="invalid"/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/import-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/import-000.xht
index 5dcda89e112..0bd5179782b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/import-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/import-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
 
   <meta name="flags" content="invalid"/>
   <style type="text/css">
@@ -15,7 +16,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/import-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/import-001.xht
index 1fdf619dd8b..920d9cd8ecc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/import-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/import-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: At-rules</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
 
   <meta name="flags" content="invalid"/>
   <style type="text/css">
@@ -17,7 +18,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/keywords-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/keywords-000.xht
index e99549dc391..ef5518f87c1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/keywords-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/keywords-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Keywords v. Strings (background)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#keywords"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { background: green; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/keywords-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/keywords-001.xht
index c7a7b89f38b..39180139e21 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/keywords-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/keywords-001.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Keywords v. Strings (width)</title>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#keywords"/>
+  <link rel="match" href="reference/keywords-001-ref.xht"/>
   <style type="text/css">
 
   p.one, p.two { width: 10em; border: medium solid; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/list-style-020.xht b/tests/wpt/css-tests/css21_dev/xhtml1/list-style-020.xht
index a7e7a37c52d..63c5d450ac5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/list-style-020.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/list-style-020.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: 'list-style' shorthand and 'none' values</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization"/>
+  <link rel="match" href="reference/list-style-020-ref.xht"/>
   <meta name="assert" content=""/>
   <style type="text/css">
     /* For better readability */
@@ -22,9 +23,8 @@
       display: list-item;
       list-style: disc;
       margin: 0.2em 0 0.2em 4em;
+      border-left: solid thin orange;
     }
-    .inside span { border-left: solid thin orange; }
-    .outside { border-left: solid thin orange; }
 
     .one   { list-style: none; color: red; }
     .two   { list-style: none none; color: red; }
@@ -49,13 +49,13 @@
    <p>Test passes if each word on the right of the orange line
     describes the shape on the left.</p>
 
-   <div class="li one outside"><span>(nothing)</span></div>
-   <div class="li two outside"><span>(nothing)</span></div>
-   <div class="li three outside"><span>blue square</span></div>
-   <div class="li four outside"><span>blue square</span></div>
-   <div class="li five outside"><span>purple diamond</span></div>
-   <div class="li six outside"><span>purple diamond</span></div>
-   <div class="li seven outside"><span>blue circle</span></div>
+   <div class="li one"><span>(nothing)</span></div>
+   <div class="li two"><span>(nothing)</span></div>
+   <div class="li three"><span>blue square</span></div>
+   <div class="li four"><span>blue square</span></div>
+   <div class="li five"><span>purple diamond</span></div>
+   <div class="li six"><span>purple diamond</span></div>
+   <div class="li seven"><span>blue circle</span></div>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-001.xht
index 530b0710a74..670c1c2facd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-001.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/matching-brackets-001-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing an at-rule by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. "/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-002.xht
index 6c1d82dbadc..cbc0ec8b8da 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-002.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/matching-brackets-002-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing a declaration by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. "/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-003.xht
index a567a57ded9..e708894bd36 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/matching-brackets-003.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/matching-brackets-001-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing a declaration by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. "/>
  <!-- simple -->
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-004.xht
index 8f74bf6b9a4..5eb6f760146 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-004.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing integer numbers with '+'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#numbers" />
+        <link rel="match" href="reference/ref-filled-black-96px-square.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Integers can be preceded by '+'." />
         <style type="text/css">
@@ -17,7 +18,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a box below.</p>
+        <p>Test passes if there is a filled black square.</p>
         <div></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-006.xht
index 98ec1897072..018f48392be 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-006.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Unsupported negative values</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/ref-filled-black-96px-square.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="If a negative length value is set on a property that does not allow negative length values, the declaration is ignored." />
         <style type="text/css">
@@ -17,7 +18,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a box below.</p>
+        <p>Test passes if there is a filled black square.</p>
         <div></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-007.xht
index 5615c330ca1..f9a4f860796 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-007.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Em sizes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (default) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-009.xht
index ca1bebe9ec1..23d0f5cc459 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-009.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with the font-size set to px size</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-009-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (pixels) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-010.xht
index 89f1e4b4350..4f509909575 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-010.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to inch</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-010-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (inches) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-011.xht
index 89eec6a960b..6b51f00ce81 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-011.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to em</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-011-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="When 'em' is assigned in the value of the 'font-size' property itself, it uses the font size of the parent element." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-012.xht
index e0514692828..7c3f11d5794 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-012.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to ex</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-012-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (ex) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-013.xht
index 50b052b0891..dd7d9aad281 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-013.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Em size with font-size set to percentage</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-013-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-015.xht
index a5090bcd7dd..573a2079b68 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-015.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Height of EX</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-014-ref-a.xht" />
+        <link rel="match" href="reference/numbers-units-014-ref-b.xht" />
         <meta name="flags" content="ahem should" />
         <meta name="assert" content="In the cases where it is impossible or impractical to determine the x-height, a value of 0.5em should be used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-018.xht
index c1443584a8b..0a944214a91 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-018.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Specifying em/ex on the root element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-018-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Units 'em' and 'ex' refer to the initial value of the property when specified on the root element of a document." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-019.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-019.xht
index 645e42e15c7..cc2592efb2e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-019.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-019.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: First available font defines the 'ex' unit size</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-019-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'ex' unit size is defined by the element's first available font." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-021.xht b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-021.xht
index 01fe5db061c..82e711d7806 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-021.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/numbers-units-021.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Root element and the 'em' unit size</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-021-ref.xht" />
         <meta name="flags" content="96dpi ahem" />
         <meta name="assert" content="The 'em' unit refers to the property's initial value when specified on the root element." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/positive-integer-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/positive-integer-001.xht
deleted file mode 100644
index 4a8e8222ea2..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/positive-integer-001.xht
+++ /dev/null
@@ -1,30 +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 Test: Parsing signed integers</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#numbers" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="Positively signed integers are treated the same as non-signed integers." />
-        <style type="text/css">
-            div
-            {
-                background-color: black;
-                height: 0.5in;
-            }
-            #div1
-            {
-                width: +1in;
-            }
-            #div2
-            {
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled square below.</p>
-        <div id="div1"></div>
-        <div id="div2"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-001.xht
index 58d4ab29d2a..bf9752f94b4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of single quotes inside double quotes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Single quotes are allowed in strings that are double quoted." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-002.xht
index d8ab29e7eb6..a68da4ef4d4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-002.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of double quotes inside single quotes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Double quotes are allowed in strings that are single quoted." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-003.xht
index fb1d2e457e0..f2971a1be6d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-003.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of escaped quotes (single within single)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Single quotes cannot occur inside single quotes unless escaped." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-004.xht
index 74319155f90..4ff01279f77 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/quoted-string-004.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Parsing of escaped double quotes</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Double quotes cannot occur inside double quotes unless escaped." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/at-rule-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/at-rule-013-ref.xht
new file mode 100644
index 00000000000..551381ae0bf
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/at-rule-013-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/attribute-token-selector-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/attribute-token-selector-002-ref.xht
new file mode 100644
index 00000000000..fae215be0d1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/attribute-token-selector-002-ref.xht
@@ -0,0 +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><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: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/bidi-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/bidi-004-ref.xht
new file mode 100644
index 00000000000..9a68a9c2911
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/bidi-004-ref.xht
@@ -0,0 +1,33 @@
+<!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="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <meta name="flags" content="ahem" />
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/blocks-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/blocks-001-ref.xht
new file mode 100644
index 00000000000..2152fe5514b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/blocks-001-ref.xht
@@ -0,0 +1,15 @@
+<!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>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/c547-indent-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/c547-indent-000-ref.xht
new file mode 100644
index 00000000000..7dcebf99f49
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/c547-indent-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>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  font: 24px/1 Ahem;
+  width: 18em;
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a tall solid unbroken column of blue below.</p>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/c5510-padn-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/c5510-padn-000-ref.xht
new file mode 100644
index 00000000000..e294a16ea4a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/c5510-padn-000-ref.xht
@@ -0,0 +1,42 @@
+<!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 {
+  width: 138px;
+  color: orange;
+  font-size: 10px;
+  line-height: 1;
+}
+div p {
+  padding: 0;
+  border: solid 24px yellow;
+}
+img {
+  vertical-align: bottom;
+}
+</style>
+</head>
+<body>
+<p>The five diagrams below should be identical.</p>
+<div>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht
new file mode 100644
index 00000000000..509ae02a5c3
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht
@@ -0,0 +1,22 @@
+<!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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/case-sensitive-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/case-sensitive-005-ref.xht
new file mode 100644
index 00000000000..0cd6ad49d5a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/case-sensitive-005-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">
+span {
+  color: blue;
+  font: larger bold monospace;
+}
+</style>
+</head>
+<body>
+<p>The number 99 must appear below.</p>
+<p><span>9</span><span>9</span></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/color-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/color-000-ref.xht
new file mode 100644
index 00000000000..cb5744b7b87
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/color-000-ref.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><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: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/colors-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/colors-006-ref.xht
new file mode 100644
index 00000000000..9bb4635bdf8
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/colors-006-ref.xht
@@ -0,0 +1,107 @@
+<!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">
+.maroonhex {
+  background: #800000;
+}
+.redhex {
+  background: #ff0000;
+}
+.orangehex {
+  background: #ffa500;
+}
+.yellowhex {
+  background: #ffff00;
+}
+.olivehex {
+  background: #808000;
+}
+.purplehex {
+  background: #800080;
+}
+.fuchsiahex {
+  background: #ff00ff;
+}
+.whitehex {
+  background: #ffffff;
+}
+.limehex {
+  background: #00ff00;
+}
+.greenhex {
+  background: #008000;
+}
+.navyhex {
+  background: #000080;
+}
+.bluehex {
+  background: #0000ff;
+}
+.aquahex {
+  background: #00ffff;
+}
+.tealhex {
+  background: #008080;
+}
+.blackhex {
+  background: #000000;
+}
+.silverhex {
+  background: #c0c0c0;
+}
+.grayhex {
+  background: #808080;
+}
+td {
+  height: 0.5in;
+  width: 0.5in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the first row of boxes below match the second row of boxes below.</p>
+<table>
+  <tr>
+    <td class="maroonhex"></td>
+    <td class="redhex"></td>
+    <td class="orangehex"></td>
+    <td class="yellowhex"></td>
+    <td class="olivehex"></td>
+    <td class="purplehex"></td>
+    <td class="fuchsiahex"></td>
+    <td class="whitehex"></td>
+    <td class="limehex"></td>
+    <td class="greenhex"></td>
+    <td class="navyhex"></td>
+    <td class="bluehex"></td>
+    <td class="aquahex"></td>
+    <td class="tealhex"></td>
+    <td class="blackhex"></td>
+    <td class="silverhex"></td>
+    <td class="grayhex"></td>
+  </tr>
+  <tr>
+    <td class="maroonhex"></td>
+    <td class="redhex"></td>
+    <td class="orangehex"></td>
+    <td class="yellowhex"></td>
+    <td class="olivehex"></td>
+    <td class="purplehex"></td>
+    <td class="fuchsiahex"></td>
+    <td class="whitehex"></td>
+    <td class="limehex"></td>
+    <td class="greenhex"></td>
+    <td class="navyhex"></td>
+    <td class="bluehex"></td>
+    <td class="aquahex"></td>
+    <td class="tealhex"></td>
+    <td class="blackhex"></td>
+    <td class="silverhex"></td>
+    <td class="grayhex"></td>
+  </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-000-ref.xht
new file mode 100644
index 00000000000..43700c1e146
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-000-ref.xht
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+</div>
+<div>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-001-ref.xht
new file mode 100644
index 00000000000..13de88d128f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-001-ref.xht
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+</div>
+<div>
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-002-ref.xht
new file mode 100644
index 00000000000..9e3a0a3b703
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-002-ref.xht
@@ -0,0 +1,48 @@
+<!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 {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a string of 12 blue filled circles below. (A string of
+12 black circles is provided on the second line for reference.):</p>
+<div id="test">
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+</div>
+<div>
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-003-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-003-ref.xht
new file mode 100644
index 00000000000..68609ac7c3e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-003-ref.xht
@@ -0,0 +1,48 @@
+<!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 {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a string of 12 blue hollow circles below. (A string of
+12 black hollow circles is provided on the second line for reference.):</p>
+<div id="test">
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+</div>
+<div>
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-004-ref.xht
new file mode 100644
index 00000000000..eef17e33c9a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-004-ref.xht
@@ -0,0 +1,33 @@
+<!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 {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there are 12 blue filled squares below.</p>
+<div id="test">
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-006-ref.xht
new file mode 100644
index 00000000000..b5b6a1ea7b3
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-006-ref.xht
@@ -0,0 +1,49 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+99
+100
+101
+</div>
+<div>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+99
+100
+101
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-007-ref.xht
new file mode 100644
index 00000000000..23a084eca28
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-007-ref.xht
@@ -0,0 +1,57 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+i
+ii
+iii
+iv
+v
+vi
+vii
+viii
+ix
+x
+xi
+xii
+xlix
+l
+ccclxxxix
+cccxc
+mmmcdlxxxix
+mmmcdxc
+mmmcdxci
+</div>
+<div>
+i
+ii
+iii
+iv
+v
+vi
+vii
+viii
+ix
+x
+xi
+xii
+xlix
+l
+ccclxxxix
+cccxc
+mmmcdlxxxix
+mmmcdxc
+mmmcdxci
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-008-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-008-ref.xht
new file mode 100644
index 00000000000..d7f9cfe652f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-008-ref.xht
@@ -0,0 +1,57 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+I
+II
+III
+IV
+V
+VI
+VII
+VIII
+IX
+X
+XI
+XII
+XLIX
+L
+CCCLXXXIX
+CCCXC
+MMMCDLXXXIX
+MMMCDXC
+MMMCDXCI
+</div>
+<div>
+I
+II
+III
+IV
+V
+VI
+VII
+VIII
+IX
+X
+XI
+XII
+XLIX
+L
+CCCLXXXIX
+CCCXC
+MMMCDLXXXIX
+MMMCDXC
+MMMCDXCI
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-009-ref.xht
new file mode 100644
index 00000000000..a3de8cf5b50
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-009-ref.xht
@@ -0,0 +1,99 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+ა
+ბ
+გ
+დ
+ე
+ვ
+ზ
+ჱ
+თ
+ი
+ია
+იბ
+კ
+ლ
+მ
+ნ
+ჲ
+ო
+პ
+ჟ
+რ
+ს
+ტ
+ჳ
+ფ
+ქ
+ღ
+ყ
+შ
+ჩ
+ც
+ძ
+წ
+ჭ
+ხ
+ჴ
+ჯ
+ჰ
+ჵ
+ჵჰშჟთ
+</div>
+<div>
+ა
+ბ
+გ
+დ
+ე
+ვ
+ზ
+ჱ
+თ
+ი
+ია
+იბ
+კ
+ლ
+მ
+ნ
+ჲ
+ო
+პ
+ჟ
+რ
+ს
+ტ
+ჳ
+ფ
+ქ
+ღ
+ყ
+შ
+ჩ
+ც
+ძ
+წ
+ჭ
+ხ
+ჴ
+ჯ
+ჰ
+ჵ
+ჵჰშჟთ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-010-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-010-ref.xht
new file mode 100644
index 00000000000..cbc054eba63
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-010-ref.xht
@@ -0,0 +1,97 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+Ա
+Բ
+Գ
+Դ
+Ե
+Զ
+Է
+Ը
+Թ
+Ժ
+ԺԱ
+ԺԲ
+Ի
+Լ
+Խ
+Ծ
+Կ
+Հ
+Ձ
+Ղ
+Ճ
+Մ
+Յ
+Ն
+Շ
+Ո
+Չ
+Պ
+Ջ
+Ռ
+Ս
+Վ
+Տ
+Ր
+Ց
+Ւ
+Փ
+Ք
+ՔՋՂԹ
+</div>
+<div>
+Ա
+Բ
+Գ
+Դ
+Ե
+Զ
+Է
+Ը
+Թ
+Ժ
+ԺԱ
+ԺԲ
+Ի
+Լ
+Խ
+Ծ
+Կ
+Հ
+Ձ
+Ղ
+Ճ
+Մ
+Յ
+Ն
+Շ
+Ո
+Չ
+Պ
+Ջ
+Ռ
+Ս
+Վ
+Տ
+Ր
+Ց
+Ւ
+Փ
+Ք
+ՔՋՂԹ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-011-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-011-ref.xht
new file mode 100644
index 00000000000..04c91f1b553
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-011-ref.xht
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+</div>
+<div>
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-013-ref.xht
new file mode 100644
index 00000000000..689b298ad7e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-013-ref.xht
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+</div>
+<div>
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-015-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-015-ref.xht
new file mode 100644
index 00000000000..ac27b5a58d3
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/content-counter-015-ref.xht
@@ -0,0 +1,43 @@
+<!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 {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+α
+β
+γ
+δ
+ε
+ζ
+η
+θ
+ι
+κ
+λ
+μ
+</div>
+<div>
+α
+β
+γ
+δ
+ε
+ζ
+η
+θ
+ι
+κ
+λ
+μ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-001-ref.xht
new file mode 100644
index 00000000000..a513b0756de
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-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">
+p {
+  color: green;
+  text-decoration: underline;
+}
+</style>
+</head>
+<body>
+<p>This sentence should be green and underlined.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-002-ref.xht
new file mode 100644
index 00000000000..034e65af8f7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-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">
+p.test {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>There must be no red.</p>
+<p class="test">This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-006-ref.xht
new file mode 100644
index 00000000000..41ffa527565
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-006-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>This line should be green.</p>
+<div>This line should be green.</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-007-ref.xht
new file mode 100644
index 00000000000..741a61f518e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/core-syntax-007-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 {
+  font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if this text is not dramatically taller than the text below.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-001-ref.xht
new file mode 100644
index 00000000000..1fbfbf0ddb7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-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">
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a number "1" below.</p>
+<div>1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-003-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-003-ref.xht
new file mode 100644
index 00000000000..97b8791d5c0
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-003-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 the equation below is true.</p>
+<p>I = I</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-004-ref.xht
new file mode 100644
index 00000000000..a8976c87c96
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-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 the equation below is true.</p>
+<p>1 = 1</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-010-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-010-ref.xht
new file mode 100644
index 00000000000..1c6e30b401d
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/counters-010-ref.xht
@@ -0,0 +1,15 @@
+<!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 equations below are true.</p>
+<p>1 = 1</p>
+<p>1.1 = 1.1</p>
+<p>1.2 = 1.2</p>
+<p>i.iii = i.iii</p>
+<p>I.IV = I.IV</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/declarations-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/declarations-009-ref.xht
new file mode 100644
index 00000000000..b390f4a9a89
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/declarations-009-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/escaped-newline-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/escaped-newline-001-ref.xht
new file mode 100644
index 00000000000..7c3a07dde76
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/escaped-newline-001-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 the words "Filler Text" below are all on the same line.</p>
+<div>Filler Text Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/escapes-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/escapes-000-ref.xht
new file mode 100644
index 00000000000..bf6fe753f21
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/escapes-000-ref.xht
@@ -0,0 +1,13 @@
+<!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>The following three paragraphs should look identical:</p>
+<p>This is a test paragraph.</p>
+<p>This is a test paragraph.</p>
+<p>This is a test paragraph.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/escapes-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/escapes-013-ref.xht
new file mode 100644
index 00000000000..1cae7925926
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/escapes-013-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: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This line should be unstyled.</p>
+<p class="green">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/font-family-invalid-characters-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht
new file mode 100644
index 00000000000..8c38fd9d633
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/font-family-invalid-characters-005-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</title>
+<link href="http://www.intel.com" rel="author" title="Intel" />
+</head><body>
+  <p>Test passes if there are only numbers (1-4) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+    <div>3</div>
+    <div>4</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht
new file mode 100644
index 00000000000..cb74bcb433e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht
@@ -0,0 +1,10 @@
+<!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" />
+</head><body>
+  <p>Test passes if there are only numbers (1-2) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/ident-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ident-000-ref.xht
new file mode 100644
index 00000000000..d7b326c8f94
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ident-000-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/ident-012-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ident-012-ref.xht
new file mode 100644
index 00000000000..9e478cf17f7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/ident-012-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/keywords-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/keywords-001-ref.xht
new file mode 100644
index 00000000000..5efaadcffee
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/keywords-001-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">
+p.test {
+  width: 10em;
+  border: medium solid;
+}
+</style>
+</head>
+<body>
+<p>The next two paragraphs should look identical:</p>
+<p class="test">Test.</p>
+<p class="test">Test.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/list-style-020-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/list-style-020-ref.xht
new file mode 100644
index 00000000000..8fa4cb34d56
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/list-style-020-ref.xht
@@ -0,0 +1,74 @@
+<!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">
+/* For better readability */
+.li {
+  font-size: 1.5em;
+  color: blue;
+}
+span {
+  color: black;
+  font-size: 0.67em;
+  vertical-align: middle;
+  padding-left: 0.2em;
+}
+
+.li {
+  display: list-item;
+  margin: 0.2em 0 0.2em 4em;
+  border-left: solid thin orange;
+}
+
+.one {
+  list-style-type: none;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.two {
+  list-style-type: none;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.three {
+  list-style-type: square;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.four {
+  list-style-type: square;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.five {
+  list-style-type: none;
+  list-style-image: url(support/diamond.png);
+  list-style-position: outside;
+}
+.six {
+  list-style-type: none;
+  list-style-image: url(support/diamond.png);
+  list-style-position: outside;
+}
+.seven {
+  list-style-type: disc;
+  list-style-image: none;
+  list-style-position: outside;
+}
+</style>
+</head>
+<body>
+<p>Test passes if each word on the right of the orange line
+describes the shape on the left.</p>
+
+<div class="li one"><span>(nothing)</span></div>
+<div class="li two"><span>(nothing)</span></div>
+<div class="li three"><span>blue square</span></div>
+<div class="li four"><span>blue square</span></div>
+<div class="li five"><span>purple diamond</span></div>
+<div class="li six"><span>purple diamond</span></div>
+<div class="li seven"><span>blue circle</span></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/matching-brackets-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/matching-brackets-001-ref.xht
new file mode 100644
index 00000000000..52739529329
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/matching-brackets-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/matching-brackets-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/matching-brackets-002-ref.xht
new file mode 100644
index 00000000000..d8bc6f3c263
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/matching-brackets-002-ref.xht
@@ -0,0 +1,15 @@
+<!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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-007-ref.xht
new file mode 100644
index 00000000000..12a1e657eb8
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-007-ref.xht
@@ -0,0 +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><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 {
+  margin-top: 10px;
+  background: black;
+  height: 1em;
+  width: 1em;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-009-ref.xht
new file mode 100644
index 00000000000..c3b750ba65f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-009-ref.xht
@@ -0,0 +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><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 {
+  margin-top: 10px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-010-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-010-ref.xht
new file mode 100644
index 00000000000..fe5b594f817
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-010-ref.xht
@@ -0,0 +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><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 {
+  margin-top: 10px;
+  background: black;
+  height: 1in;
+  width: 1in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-011-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-011-ref.xht
new file mode 100644
index 00000000000..108463c703f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-011-ref.xht
@@ -0,0 +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><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 {
+  margin-top: 10px;
+  background: black;
+  height: 3em;
+  width: 3em;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-012-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-012-ref.xht
new file mode 100644
index 00000000000..a6ae6116762
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-012-ref.xht
@@ -0,0 +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><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 {
+  margin-top: 5px;
+  background: black;
+  height: 1in;
+  width: 1in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the three boxes below are the same size.</p>
+<div></div><div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-013-ref.xht
new file mode 100644
index 00000000000..729b4a1569b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-013-ref.xht
@@ -0,0 +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><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 {
+  margin-top: 5px;
+  background: black;
+  height: 100px;
+  width: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the three boxes below are the same size.</p>
+<div></div><div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-018-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-018-ref.xht
new file mode 100644
index 00000000000..272d4a07af0
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-018-ref.xht
@@ -0,0 +1,39 @@
+<!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">
+html {
+  border: 1px solid;
+  margin-left: 400px;
+  margin-top: 320px;
+}
+p {
+  font: 16px serif;
+}
+div {
+  position: absolute;
+}
+#div1 {
+  background: orange;
+  height: 20px;
+  left: 0;
+  top: 320px;
+  width: 400px;
+}
+#div2 {
+  background: blue;
+  height: 320px;
+  left: 400px;
+  top: 0;
+  width: 20px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the black box containing this text is to the right of the orange box and below the blue box.</p>
+<div id="div1"></div>
+<div id="div2"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-019-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-019-ref.xht
new file mode 100644
index 00000000000..709eb624a8b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-019-ref.xht
@@ -0,0 +1,22 @@
+<!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">
+p {
+  font-size: 12pt;
+}
+div {
+  margin-top: 3px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-021-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-021-ref.xht
new file mode 100644
index 00000000000..698445bbaa2
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/numbers-units-021-ref.xht
@@ -0,0 +1,22 @@
+<!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">
+p {
+  font-family: serif;
+}
+div {
+  margin-top: 2px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/quoted-string-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/quoted-string-001-ref.xht
new file mode 100644
index 00000000000..9a1f73b6810
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/quoted-string-001-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 the words "Filler Text" below are single quoted (').</p>
+<div>'Filler Text'</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/quoted-string-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/quoted-string-002-ref.xht
new file mode 100644
index 00000000000..cb50dadf9c7
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/quoted-string-002-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 the words "Filler Text" below are double quoted (").</p>
+<div>"Filler Text"</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/selectors-parsing-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/selectors-parsing-001-ref.xht
new file mode 100644
index 00000000000..91aefbef7e9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/selectors-parsing-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">
+p {
+  color: green;
+  background: white;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/sgml-comments-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/sgml-comments-002-ref.xht
new file mode 100644
index 00000000000..ffd50f07107
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/sgml-comments-002-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">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This text should be green.</p>
+<p>This text should be green.</p>
+<p>This text should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/units-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/units-005-ref.xht
new file mode 100644
index 00000000000..d8e977fddc3
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/units-005-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">
+p {
+  font-size: 12pt;
+}
+div {
+  width: 8.7em;
+  height: 8.7em;
+  background: green;
+  border: solid lime;
+}
+}
+</style>
+</head>
+<body>
+<p>You should see no red below, just a green square with a green border.</p>
+<div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-012-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-012-ref.xht
new file mode 100644
index 00000000000..627fd1e45d1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-012-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">
+p {
+  color: green;
+  border: solid green;
+}
+</style>
+</head>
+<body>
+<p>This sentence should be green with a green border.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-016-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-016-ref.xht
new file mode 100644
index 00000000000..17d7a0f7df0
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-016-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">
+p.green {
+  color: green;
+}
+p.white {
+  color: white;
+}
+</style>
+</head>
+<body>
+<p class="green">This sentence must be green and there must be no red.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="green">This sentence must be green and there must be no red.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="white">There must be no red on this page.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-017-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-017-ref.xht
new file mode 100644
index 00000000000..81200fc718a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/uri-017-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">
+p {
+  color: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must have a green background.</p>
+<p>This sentence must have a green background.</p>
+</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 aca469ce249..520e93482dd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
@@ -3576,6 +3576,206 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-001" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP Charset vs BOM">
+          <a href="at-charset-001.xht">at-charset-001</a></td>
+        <td><a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-002" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP Charset over @charset">
+          <a href="at-charset-002.xht">at-charset-002</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-003" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over link charset">
+          <a href="at-charset-003.xht">at-charset-003</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-004" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over set referring code page (UTF-8)">
+          <a href="at-charset-004.xht">at-charset-004</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-005" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over set referring code page (windows-1252)">
+          <a href="at-charset-005.xht">at-charset-005</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-006" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over referring code page (not set)">
+          <a href="at-charset-006.xht">at-charset-006</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-007" class="">
+      <tr>
+        <td rowspan="1" title="@charset over link charset attribute">
+          <a href="at-charset-007.xht">at-charset-007</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-008" class="">
+      <tr>
+        <td rowspan="1" title="@charset over referring document's code page (set)">
+          <a href="at-charset-008.xht">at-charset-008</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-009" class="">
+      <tr>
+        <td rowspan="1" title="@charset over referring document's code page (unset)">
+          <a href="at-charset-009.xht">at-charset-009</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-010" class="">
+      <tr>
+        <td rowspan="1" title="Link charset attribute over referring document's codepage (set)">
+          <a href="at-charset-010.xht">at-charset-010</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-011" class="">
+      <tr>
+        <td rowspan="1" title="Link charset attribute over referring document's codepage (not set)">
+          <a href="at-charset-011.xht">at-charset-011</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-012" class="">
+      <tr>
+        <td rowspan="1" title="Stylesheet encoding via the referring document's encoding (set)">
+          <a href="at-charset-012.xht">at-charset-012</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-014" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-8)">
+          <a href="at-charset-014.xht">at-charset-014</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-015" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-16 LE)">
+          <a href="at-charset-015.xht">at-charset-015</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-016" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-16 BE)">
+          <a href="at-charset-016.xht">at-charset-016</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-019" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-8)">
+          <a href="at-charset-019.xht">at-charset-019</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-020" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-16LE)">
+          <a href="at-charset-020.xht">at-charset-020</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-021" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-16BE)">
+          <a href="at-charset-021.xht">at-charset-021</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-024" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (windows-1252)">
+          <a href="at-charset-024.xht">at-charset-024</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-025" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (Shift-JIS)">
+          <a href="at-charset-025.xht">at-charset-025</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-026" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (ISO-8859-6)">
+          <a href="at-charset-026.xht">at-charset-026</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-027" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (Big5)">
+          <a href="at-charset-027.xht">at-charset-027</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-028" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-8)">
+          <a href="at-charset-028.xht">at-charset-028</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-029" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-16LE)">
+          <a href="at-charset-029.xht">at-charset-029</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-030" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-16BE)">
+          <a href="at-charset-030.xht">at-charset-030</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-033" class="">
       <tr>
         <td rowspan="1" title="Non-matching BOM (windows-1252 with UTF-8 BOM)">
@@ -3624,6 +3824,78 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-040" class="">
+      <tr>
+        <td rowspan="1" title="Non-matching @charset (UTF-16BE with UTF-8 @charset)">
+          <a href="at-charset-040.xht">at-charset-040</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-041" class="">
+      <tr>
+        <td rowspan="1" title="Non-matching @charset (UTF-32LE with UTF-16BE @charset)">
+          <a href="at-charset-041.xht">at-charset-041</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-042" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-042.xht">at-charset-042</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-043" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)">
+          <a href="at-charset-043.xht">at-charset-043</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-044" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-044.xht">at-charset-044</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-045" class="">
+      <tr>
+        <td rowspan="1" title="Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-045.xht">at-charset-045</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-046" class="">
+      <tr>
+        <td rowspan="1" title="Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)">
+          <a href="at-charset-046.xht">at-charset-046</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-047" class="">
+      <tr>
+        <td rowspan="1" title="Endianness not specified (UTF-16LE encoding with UTF-16 @charset)">
+          <a href="at-charset-047.xht">at-charset-047</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-048" class="">
+      <tr>
+        <td rowspan="1" title="Endianness not specified (UTF-16BE encoding with UTF-16 @charset)">
+          <a href="at-charset-048.xht">at-charset-048</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-049" class="">
       <tr>
         <td rowspan="1" title="@charset preceded by a newline">
@@ -3664,6 +3936,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-054" class="">
+      <tr>
+        <td rowspan="1" title="@charset in uppercase">
+          <a href="at-charset-054.xht">at-charset-054</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-055" class="">
       <tr>
         <td rowspan="1" title="@charset without quotes">
@@ -3672,6 +3952,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-056" class="">
+      <tr>
+        <td rowspan="1" title="@charset missing a space">
+          <a href="at-charset-056.xht">at-charset-056</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-057" class="">
       <tr>
         <td rowspan="1" title="@charset escaped numerically">
@@ -3696,6 +3984,78 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-060" class="">
+      <tr>
+        <td rowspan="1" title="@charset with bogus name">
+          <a href="at-charset-060.xht">at-charset-060</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-061" class="">
+      <tr>
+        <td rowspan="1" title="@charset within style block">
+          <a href="at-charset-061.xht">at-charset-061</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-071" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-1">
+          <a href="at-charset-071.xht">at-charset-071</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-072" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-11">
+          <a href="at-charset-072.xht">at-charset-072</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-073" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-5">
+          <a href="at-charset-073.xht">at-charset-073</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-074" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-6">
+          <a href="at-charset-074.xht">at-charset-074</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-075" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-7">
+          <a href="at-charset-075.xht">at-charset-075</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-076" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-8">
+          <a href="at-charset-076.xht">at-charset-076</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-077" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: KOI8-R">
+          <a href="at-charset-077.xht">at-charset-077</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-quotes-001" class="">
       <tr>
         <td rowspan="1" title="@charset quotes">
@@ -3816,6 +4176,54 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-import-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following a known but invalid @rule">
+          <a href="at-import-009.xht">at-import-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-import-010" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following an invalid selector">
+          <a href="at-import-010.xht">at-import-010</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-import-011" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following garbage">
+          <a href="at-import-011.xht">at-import-011</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-000" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-000.xht">at-keywords-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-001" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-001.xht">at-keywords-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-002.xht">at-keywords-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="at-rule-001" class="invalid">
       <tr>
         <td rowspan="1" title="Parser error handling with invalid at-rules: @ invalid selector">
@@ -3912,6 +4320,54 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="at-rule-013" class="invalid">
+      <tr>
+        <td rowspan="1" title="Ignoring at-rules inside @media blocks">
+          <a href="at-rule-013.xht">at-rule-013</a></td>
+        <td><a href="reference/at-rule-013-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-000.xht">at-rules-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-001" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-001.xht">at-rules-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-002" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-002.xht">at-rules-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-003" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-003.xht">at-rules-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-004" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-004.xht">at-rules-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="attribute-selector-001" class="">
       <tr>
         <td rowspan="1" title="ID selector without value and no matching element">
@@ -3928,6 +4384,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="attribute-token-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="[attr~=&quot;&quot;]Attribute Selectors with Empty String Values">
+          <a href="attribute-token-selector-002.xht">attribute-token-selector-002</a></td>
+        <td><a href="reference/attribute-token-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="attribute-value-selector-004" class="invalid">
       <tr>
         <td rowspan="1" title="Numeric attributes">
@@ -8080,6 +8544,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="bidi-005a" class="">
       <tr>
         <td rowspan="1" title="The bidi algorithm and inlines in CSS: embed levels and white-space: pre;">
@@ -9416,6 +9888,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="blocks-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Parsing nested blocks and strings in style blocks">
+          <a href="blocks-001.xht">blocks-001</a></td>
+        <td><a href="reference/blocks-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="blocks-002" class="">
       <tr>
         <td rowspan="1" title="Empty declaration block">
@@ -19724,6 +20204,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="c547-indent-000" class="ahem">
+      <tr>
+        <td rowspan="1" title="text-indent">
+          <a href="c547-indent-000.xht">c547-indent-000</a></td>
+        <td><a href="reference/c547-indent-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="c547-indent-001" class="">
       <tr>
         <td rowspan="1" title="text-indent">
@@ -20220,6 +20708,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="c5510-padn-000" class="ahem image">
+      <tr>
+        <td rowspan="1" title="padding">
+          <a href="c5510-padn-000.xht">c5510-padn-000</a></td>
+        <td><a href="reference/c5510-padn-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="c5510-padn-001" class="ahem">
       <tr>
         <td rowspan="1" title="padding">
@@ -20636,6 +21132,110 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="cascade-import-dynamic-001" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet append (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-001.xht">cascade-import-dynamic-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-002" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet append (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-002.xht">cascade-import-dynamic-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-003" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet insertion (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-003.xht">cascade-import-dynamic-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-004" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet insertion (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-004.xht">cascade-import-dynamic-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-005" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet deletion (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-005.xht">cascade-import-dynamic-005</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-006" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet deletion (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-006.xht">cascade-import-dynamic-006</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-control" class="">
+      <tr>
+        <td rowspan="1" title="Control test">
+          <a href="cascade-import-dynamic-control.xht">cascade-import-dynamic-control</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-000" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of Properties and Keywords (background)">
+          <a href="case-sensitive-000.xht">case-sensitive-000</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-001" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of At-rules (@media)">
+          <a href="case-sensitive-001.xht">case-sensitive-001</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-003" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of pseudo-classes and pseudo-elements">
+          <a href="case-sensitive-003.xht">case-sensitive-003</a></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-004" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of :lang() arguments">
+          <a href="case-sensitive-004.xht">case-sensitive-004</a></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-005" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of counter names">
+          <a href="case-sensitive-005.xht">case-sensitive-005</a></td>
+        <td><a href="reference/case-sensitive-005-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-007" class="nonHTML">
+      <tr>
+        <td rowspan="1" title="Case sensitivity with element selectors">
+          <a href="case-sensitive-007.xht">case-sensitive-007</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="charset-attr-001" class="">
       <tr>
         <td rowspan="1" title="@charset test-attribute">
@@ -21388,6 +21988,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="color-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="RGB color syntax error handling">
+          <a href="color-000.xht">color-000</a></td>
+        <td><a href="reference/color-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="color-001" class="ahem invalid">
       <tr>
         <td rowspan="1" title="Color set to hex with 5 digits which is invalid and is equivalent to minimum minus one value for 6 digit hex">
@@ -22724,6 +23332,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="colors-006" class="">
+      <tr>
+        <td rowspan="1" title="Comparing color keywords and hex values">
+          <a href="colors-006.xht">colors-006</a></td>
+        <td><a href="reference/colors-006-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="colors-007" class="invalid">
       <tr>
         <td rowspan="1" title="Color keyword syntax">
@@ -23068,6 +23684,142 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="content-counter-000" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c)">
+          <a href="content-counter-000.xht">content-counter-000</a></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-001" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, none)">
+          <a href="content-counter-001.xht">content-counter-001</a></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-002" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, disc)">
+          <a href="content-counter-002.xht">content-counter-002</a></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-003" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, circle)">
+          <a href="content-counter-003.xht">content-counter-003</a></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-004" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, square)">
+          <a href="content-counter-004.xht">content-counter-004</a></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-005" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, decimal)">
+          <a href="content-counter-005.xht">content-counter-005</a></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-006" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, decimal-leading-zero)">
+          <a href="content-counter-006.xht">content-counter-006</a></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-007" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-roman)">
+          <a href="content-counter-007.xht">content-counter-007</a></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-008" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-roman)">
+          <a href="content-counter-008.xht">content-counter-008</a></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-009" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, georgian)">
+          <a href="content-counter-009.xht">content-counter-009</a></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-010" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, armenian)">
+          <a href="content-counter-010.xht">content-counter-010</a></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-011" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-latin)">
+          <a href="content-counter-011.xht">content-counter-011</a></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-012" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-alpha)">
+          <a href="content-counter-012.xht">content-counter-012</a></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-013" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-latin)">
+          <a href="content-counter-013.xht">content-counter-013</a></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-014" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-alpha)">
+          <a href="content-counter-014.xht">content-counter-014</a></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-015" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-greek)">
+          <a href="content-counter-015.xht">content-counter-015</a></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-016" class="invalid">
+      <tr>
+        <td rowspan="1" title="content: counter() error cases">
+          <a href="content-counter-016.xht">content-counter-016</a></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="content-inherit-002" class="">
       <tr>
         <td rowspan="1" title="CSS inheritance: content with tables">
@@ -23092,6 +23844,70 @@
         <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
       </tr>
     </tbody>
+    <tbody id="core-syntax-001" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places">
+          <a href="core-syntax-001.xht">core-syntax-001</a></td>
+        <td><a href="reference/core-syntax-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-002" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places">
+          <a href="core-syntax-002.xht">core-syntax-002</a></td>
+        <td><a href="reference/core-syntax-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-003" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places (with no whitespace)">
+          <a href="core-syntax-003.xht">core-syntax-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-004" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places (with no whitespace)">
+          <a href="core-syntax-004.xht">core-syntax-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-006" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-006.xht">core-syntax-006</a></td>
+        <td><a href="reference/core-syntax-006-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-007" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-007.xht">core-syntax-007</a></td>
+        <td><a href="reference/core-syntax-007-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-008" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-008.xht">core-syntax-008</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-009" class="">
+      <tr>
+        <td rowspan="1" title="Syntactic White Space">
+          <a href="core-syntax-009.xht">core-syntax-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="counter-reset-increment-002" class="">
       <tr>
         <td rowspan="1" title="counter-reset - negative value with positive counter-increment">
@@ -23100,6 +23916,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="counters-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter functions with just the identifier">
+          <a href="counters-001.xht">counters-001</a></td>
+        <td><a href="reference/counters-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="counters-002" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid counter functions - Too many arguments">
@@ -23108,6 +23932,118 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="counters-003" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with no white space">
+          <a href="counters-003.xht">counters-003</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with no white space and two function values">
+          <a href="counters-004.xht">counters-004</a></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-005" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with no white space and three function values">
+          <a href="counters-005.xht">counters-005</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-006" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with white space">
+          <a href="counters-006.xht">counters-006</a></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-007" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with white space and two function values">
+          <a href="counters-007.xht">counters-007</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-008" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with white space and two function values">
+          <a href="counters-008.xht">counters-008</a></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-009" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with white space and three function values">
+          <a href="counters-009.xht">counters-009</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-010" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() functions">
+          <a href="counters-010.xht">counters-010</a></td>
+        <td><a href="reference/counters-010-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing ':', value, part 1">
+          <a href="declaration-001.xht">declaration-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing ':', value, part 2">
+          <a href="declaration-002.xht">declaration-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing value, part 1">
+          <a href="declaration-003.xht">declaration-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-004" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing value, part 2">
+          <a href="declaration-004.xht">declaration-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-005" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration: unexpected tokens { }, part 1">
+          <a href="declaration-005.xht">declaration-005</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-006" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration: unexpected tokens { }, part 2">
+          <a href="declaration-006.xht">declaration-006</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="declaration-whitespace-001" class="">
       <tr>
         <td rowspan="1" title="Parsing white space in style declaration">
@@ -23116,6 +24052,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="declarations-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="Ignoring at-rules inside declaration blocks">
+          <a href="declarations-009.xht">declarations-009</a></td>
+        <td><a href="reference/declarations-009-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="default-attribute-selector-001" class="">
       <tr>
         <td rowspan="1" title="attribute selector - Default attribute values in DTDs">
@@ -23812,6 +24756,134 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="escaped-newline-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing strings with escaped newlines">
+          <a href="escaped-newline-001.xht">escaped-newline-001</a></td>
+        <td><a href="reference/escaped-newline-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-000" class="">
+      <tr>
+        <td rowspan="1" title="Escaped Newline in String">
+          <a href="escapes-000.xht">escapes-000</a></td>
+        <td><a href="reference/escapes-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-001" class="">
+      <tr>
+        <td rowspan="1" title="Escaped Quote Marks in String">
+          <a href="escapes-001.xht">escapes-001</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-002" class="">
+      <tr>
+        <td rowspan="1" title="Invalid Punctuation Escapes">
+          <a href="escapes-002.xht">escapes-002</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-003" class="">
+      <tr>
+        <td rowspan="1" title="Class and Keyword Letter Escapes">
+          <a href="escapes-003.xht">escapes-003</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-004" class="">
+      <tr>
+        <td rowspan="1" title="Unicode Escapes">
+          <a href="escapes-004.xht">escapes-004</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-005" class="">
+      <tr>
+        <td rowspan="1" title="Unicode Escapes and Case Insensitivity">
+          <a href="escapes-005.xht">escapes-005</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-006" class="">
+      <tr>
+        <td rowspan="1" title="Incorrect Letter Escape (Class Selector)">
+          <a href="escapes-006.xht">escapes-006</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-007" class="">
+      <tr>
+        <td rowspan="1" title="Space-terminated Unicode Escapes">
+          <a href="escapes-007.xht">escapes-007</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-008" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Space-terminated Character Escapes">
+          <a href="escapes-008.xht">escapes-008</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="Characters and case: Escaping a character inside a keyword">
+          <a href="escapes-009.xht">escapes-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-010" class="invalid">
+      <tr>
+        <td rowspan="1" title="Unicode-escaped Braces">
+          <a href="escapes-010.xht">escapes-010</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-011" class="">
+      <tr>
+        <td rowspan="1" title="CSS Parsing: Escaped keywords">
+          <a href="escapes-011.xht">escapes-011</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-012" class="">
+      <tr>
+        <td rowspan="1" title="CSS Parsing: Escaped keywords">
+          <a href="escapes-012.xht">escapes-012</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-013" class="">
+      <tr>
+        <td rowspan="1" title="Escaping and spaces with classes">
+          <a href="escapes-013.xht">escapes-013</a></td>
+        <td><a href="reference/escapes-013-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-014" class="">
+      <tr>
+        <td rowspan="1" title="Escaping and spaces with declarations">
+          <a href="escapes-014.xht">escapes-014</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="escapes-015" class="invalid">
       <tr>
         <td rowspan="1" title="Escape of non-printable characters within declarations, applying to property values">
@@ -26212,6 +27284,38 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="font-family-invalid-characters-003" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid curly brackets and pair matching">
+          <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-004" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid square brackets and pair matching">
+          <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-005" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid quotes and pair matching">
+          <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.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>
+    <tbody id="font-family-invalid-characters-006" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid single quotes and pair matching">
+          <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.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>
     <tbody id="font-family-name-001" class="font">
       <tr>
         <td rowspan="1" title="font family name with no quotes">
@@ -27948,6 +29052,118 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="ident-000" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (a-z) as Classes and IDs">
+          <a href="ident-000.xht">ident-000</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-001" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs">
+          <a href="ident-001.xht">ident-001</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-002" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with _) as Classes and IDs">
+          <a href="ident-002.xht">ident-002</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with -) as Classes and IDs">
+          <a href="ident-003.xht">ident-003</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-004" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with ideographic) as Classes and IDs">
+          <a href="ident-004.xht">ident-004</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-005" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including ideographic) as Classes and IDs">
+          <a href="ident-005.xht">ident-005</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-006" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escape) as Classes and IDs">
+          <a href="ident-006.xht">ident-006</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-007" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including escape) as Classes and IDs">
+          <a href="ident-007.xht">ident-007</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-008" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Identifiers (starting with digit) as Classes and IDs">
+          <a href="ident-008.xht">ident-008</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-009" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including digits) as Classes and IDs">
+          <a href="ident-009.xht">ident-009</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-010" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escape) as Classes and IDs">
+          <a href="ident-010.xht">ident-010</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-011" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including escapes) as Classes and IDs">
+          <a href="ident-011.xht">ident-011</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-012" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs">
+          <a href="ident-012.xht">ident-012</a></td>
+        <td><a href="reference/ident-012-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-013" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escaped -) as Classes and IDs">
+          <a href="ident-013.xht">ident-013</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="ident-014" class="">
       <tr>
         <td rowspan="1" title="Selector attributes and hyphens">
@@ -27996,6 +29212,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="ident-020" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Identifiers (starting with double -) as Classes and IDs">
+          <a href="ident-020.xht">ident-020</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="ignored-rules-001" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid rules that precede good rules">
@@ -28052,6 +29276,22 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="import-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="import-000.xht">import-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="import-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="import-001.xht">import-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="inherit-static-offset-001" class="image">
       <tr>
         <td rowspan="1" title="top and left - inherit keyword on element with statically positioned parent">
@@ -29236,6 +30476,22 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="keywords-000" class="">
+      <tr>
+        <td rowspan="1" title="Keywords v. Strings (background)">
+          <a href="keywords-000.xht">keywords-000</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="keywords-001" class="">
+      <tr>
+        <td rowspan="1" title="Keywords v. Strings (width)">
+          <a href="keywords-001.xht">keywords-001</a></td>
+        <td><a href="reference/keywords-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="lang-selector-002" class="invalid">
       <tr>
         <td rowspan="1" title="Empty :lang selector">
@@ -30460,6 +31716,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="list-style-020" class="">
+      <tr>
+        <td rowspan="1" title="'list-style' shorthand and 'none' values">
+          <a href="list-style-020.xht">list-style-020</a></td>
+        <td><a href="reference/list-style-020-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="list-style-021" class="image">
       <tr>
         <td rowspan="1" title="list-style: none - followed by a list-style-image reset">
@@ -33468,6 +34732,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="matching-brackets-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for @rules">
+          <a href="matching-brackets-001.xht">matching-brackets-001</a></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="matching-brackets-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for declarations">
+          <a href="matching-brackets-002.xht">matching-brackets-002</a></td>
+        <td><a href="reference/matching-brackets-002-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="matching-brackets-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for selectors">
+          <a href="matching-brackets-003.xht">matching-brackets-003</a></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="max-height-001" class="invalid">
       <tr>
         <td rowspan="1" title="Max-height using pixels with a minimum minus one value, -1px">
@@ -36540,6 +37828,14 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing integer numbers with '+'">
+          <a href="numbers-units-004.xht">numbers-units-004</a></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="numbers-units-005" class="">
       <tr>
         <td rowspan="1" title="Optional unit identifier after 0">
@@ -36548,6 +37844,73 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-006" class="invalid">
+      <tr>
+        <td rowspan="1" title="Unsupported negative values">
+          <a href="numbers-units-006.xht">numbers-units-006</a></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-007" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em sizes">
+          <a href="numbers-units-007.xht">numbers-units-007</a></td>
+        <td><a href="reference/numbers-units-007-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-009" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with the font-size set to px size">
+          <a href="numbers-units-009.xht">numbers-units-009</a></td>
+        <td><a href="reference/numbers-units-009-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-010" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to inch">
+          <a href="numbers-units-010.xht">numbers-units-010</a></td>
+        <td><a href="reference/numbers-units-010-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-011" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to em">
+          <a href="numbers-units-011.xht">numbers-units-011</a></td>
+        <td><a href="reference/numbers-units-011-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-012" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to ex">
+          <a href="numbers-units-012.xht">numbers-units-012</a></td>
+        <td><a href="reference/numbers-units-012-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-013" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to percentage">
+          <a href="numbers-units-013.xht">numbers-units-013</a></td>
+        <td><a href="reference/numbers-units-013-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-015" class="ahem should">
+      <tr>
+        <td rowspan="2" title="Height of EX">
+          <a href="numbers-units-015.xht">numbers-units-015</a></td>
+        <td><a href="reference/numbers-units-014-ref-a.xht">=</a> </td>
+        <td rowspan="2"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="should" title="Behavior tested is recommended but not required">Recommend</abbr></td>
+      </tr>
+      <tr>
+        <td><a href="reference/numbers-units-014-ref-a.xht">=</a></td>
+      </tr>
+    </tbody>
     <tbody id="numbers-units-016" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid percentage values - decimal value with multiple decimals">
@@ -36564,6 +37927,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-018" class="ahem">
+      <tr>
+        <td rowspan="1" title="Specifying em/ex on the root element">
+          <a href="numbers-units-018.xht">numbers-units-018</a></td>
+        <td><a href="reference/numbers-units-018-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-019" class="ahem">
+      <tr>
+        <td rowspan="1" title="First available font defines the 'ex' unit size">
+          <a href="numbers-units-019.xht">numbers-units-019</a></td>
+        <td><a href="reference/numbers-units-019-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-021" class="96dpi ahem">
+      <tr>
+        <td rowspan="1" title="Root element and the 'em' unit size">
+          <a href="numbers-units-021.xht">numbers-units-021</a></td>
+        <td><a href="reference/numbers-units-021-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="96dpi" title="Only valid on 96dpi displays">96</abbr><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="other-attribute-001" class="">
       <tr>
         <td rowspan="1" title="Function 'attr()' referencing another elements attribute data">
@@ -40316,6 +41703,38 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="quoted-string-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of single quotes inside double quotes">
+          <a href="quoted-string-001.xht">quoted-string-001</a></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-002" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of double quotes inside single quotes">
+          <a href="quoted-string-002.xht">quoted-string-002</a></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-003" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of escaped quotes (single within single)">
+          <a href="quoted-string-003.xht">quoted-string-003</a></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of escaped double quotes">
+          <a href="quoted-string-004.xht">quoted-string-004</a></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="quotes-035" class="should">
       <tr>
         <td rowspan="1" title="CSS and Quotes: Counting Right (Slightly Simpler Version)">
@@ -42044,6 +43463,14 @@
         <td rowspan="1"><abbr class="dom" title="Requires Document Object Model support">DOM/JS</abbr></td>
       </tr>
     </tbody>
+    <tbody id="selectors-parsing-001" class="">
+      <tr>
+        <td rowspan="1" title="CSS: Selector Parsing and Invalid Pseudo-Elements">
+          <a href="selectors-parsing-001.xht">selectors-parsing-001</a></td>
+        <td><a href="reference/selectors-parsing-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="separated-border-model-003a" class="">
       <tr>
         <td rowspan="1" title="table width as set when greater than sum of columns width">
@@ -42124,6 +43551,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="sgml-comments-000" class="">
+      <tr>
+        <td rowspan="1" title="SGML comments">
+          <a href="sgml-comments-000.xht">sgml-comments-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="sgml-comments-001" class="">
       <tr>
         <td rowspan="1" title="Parsing SGML comments">
@@ -42132,6 +43567,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="sgml-comments-002" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of CDO/CDC in stylesheets">
+          <a href="sgml-comments-002.xht">sgml-comments-002</a></td>
+        <td><a href="reference/sgml-comments-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="shand-border-000" class="">
       <tr>
         <td rowspan="1" title="Shorthand Properties (border)">
@@ -42308,6 +43751,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="strings-000" class="">
+      <tr>
+        <td rowspan="1" title="Newlines in strings">
+          <a href="strings-000.xht">strings-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="style-attr-cascade-001" class="">
       <tr>
         <td rowspan="1" title="CSS: style attributes vs. important tag selector">
@@ -43604,6 +45055,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="units-005" class="">
+      <tr>
+        <td rowspan="1" title="Units: em (0.87em floats)">
+          <a href="units-005.xht">units-005</a></td>
+        <td><a href="reference/units-005-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="units-006" class="ahem">
       <tr>
         <td rowspan="1" title="Units: px and font-size">
@@ -43644,6 +45103,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="unterminated-string-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Error handling of unterminated strings">
+          <a href="unterminated-string-001.xht">unterminated-string-001</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-001" class="">
       <tr>
         <td rowspan="1" title="Parsing valid URIs with white space and no quotes">
@@ -43668,6 +45135,22 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-004" class="image">
+      <tr>
+        <td rowspan="1" title="URL function with URI that has escaped special chars">
+          <a href="uri-004.xht">uri-004</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-005" class="image">
+      <tr>
+        <td rowspan="1" title="URL function with escaped special chars - single quote">
+          <a href="uri-005.xht">uri-005</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-006" class="image invalid">
       <tr>
         <td rowspan="1" title="Invalid character (*) after URL function values">
@@ -43716,6 +45199,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-012" class="invalid">
+      <tr>
+        <td rowspan="1" title="Error handling of broken url() - balancing braces">
+          <a href="uri-012.xht">uri-012</a></td>
+        <td><a href="reference/uri-012-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-013" class="invalid">
       <tr>
         <td rowspan="1" title="handling of invalid url() functions">
@@ -43724,6 +45215,46 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-014" class="">
+      <tr>
+        <td rowspan="1" title="Unquoted commas in url()">
+          <a href="uri-014.xht">uri-014</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-015" class="">
+      <tr>
+        <td rowspan="1" title="Escaped url() functional notation">
+          <a href="uri-015.xht">uri-015</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-016" class="">
+      <tr>
+        <td rowspan="1" title="Error handling of broken url() with open /*">
+          <a href="uri-016.xht">uri-016</a></td>
+        <td><a href="reference/uri-016-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-017" class="image invalid">
+      <tr>
+        <td rowspan="1" title="Unclosed URI Token at EOF (in declaration)">
+          <a href="uri-017.xht">uri-017</a></td>
+        <td><a href="reference/uri-017-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-018" class="image invalid">
+      <tr>
+        <td rowspan="1" title="Unclosed URI Token at EOF (in @import)">
+          <a href="uri-018.xht">uri-018</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="vertical-align-004" class="ahem">
       <tr>
         <td rowspan="1" title="Vertical-align using pixels with a negative zero value, -0px">
@@ -44548,6 +46079,22 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="whitespace-001" class="">
+      <tr>
+        <td rowspan="1" title="White space - em-space (U+2003)">
+          <a href="whitespace-001.xht">whitespace-001</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="whitespace-002" class="">
+      <tr>
+        <td rowspan="1" title="White space - ideographic space (U+3000)">
+          <a href="whitespace-002.xht">whitespace-002</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="width-001" class="invalid">
       <tr>
         <td rowspan="1" title="Width using pixels with a minimum minus one value, -1px">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
index bd98a9359cc..f827c2fb8e9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
@@ -443,21 +443,66 @@ anonymous-boxes-001b.xht == reference/anonymous-boxes-001b-ref.xht
 anonymous-boxes-inheritance-001.xht == reference/anonymous-boxes-inheritance-001-ref.xht
 anonymous-inline-whitespace-001.xht == reference/ref-if-there-is-no-red.xht
 anonymous-table-box-width-001.xht == reference/ref-filled-green-100px-square.xht
+at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-002.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-003.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-004.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-005.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-006.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-007.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-008.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-009.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-010.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-011.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-012.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-014.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-015.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-016.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-019.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-020.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-021.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-024.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-025.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-026.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-027.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-028.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-029.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-030.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
 at-charset-033.xht == reference/filler-text-below-green.xht
 at-charset-034.xht == reference/filler-text-below-green.xht
 at-charset-035.xht == reference/filler-text-below-green.xht
 at-charset-036.xht == reference/filler-text-below-green.xht
 at-charset-037.xht == reference/filler-text-below-green.xht
 at-charset-038.xht == reference/filler-text-below-green.xht
+at-charset-040.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-041.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-042.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-043.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-044.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-045.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-046.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-047.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-048.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
 at-charset-049.xht == reference/filler-text-below-green.xht
 at-charset-050.xht == reference/filler-text-below-green.xht
 at-charset-051.xht == reference/filler-text-below-green.xht
 at-charset-052.xht == reference/filler-text-below-green.xht
 at-charset-053.xht == reference/filler-text-below-green.xht
+at-charset-054.xht == reference/filler-text-below-green.xht
 at-charset-055.xht == reference/filler-text-below-green.xht
+at-charset-056.xht == reference/filler-text-below-green.xht
 at-charset-057.xht == reference/filler-text-below-green.xht
 at-charset-058.xht == reference/filler-text-below-green.xht
 at-charset-059.xht == reference/filler-text-below-green.xht
+at-charset-060.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-061.xht == reference/filler-text-below-green.xht
+at-charset-071.xht == reference/ref-green-background.xht
+at-charset-072.xht == reference/ref-green-background.xht
+at-charset-073.xht == reference/ref-green-background.xht
+at-charset-074.xht == reference/ref-green-background.xht
+at-charset-075.xht == reference/ref-green-background.xht
+at-charset-076.xht == reference/ref-green-background.xht
+at-charset-077.xht == reference/ref-green-background.xht
 at-charset-quotes-001.xht == reference/at-charset-ref.xht
 at-charset-space-001.xht == reference/at-charset-ref.xht
 at-charset-space-002.xht == reference/at-charset-ref.xht
@@ -473,6 +518,12 @@ at-import-004.xht == reference/no-red-filler-text-ref.xht
 at-import-005.xht == reference/filler-text-below-green.xht
 at-import-006.xht == reference/filler-text-below-green.xht
 at-import-007.xht == reference/filler-text-below-green.xht
+at-import-009.xht == reference/ref-this-text-should-be-green.xht
+at-import-010.xht == reference/ref-this-text-should-be-green.xht
+at-import-011.xht == reference/ref-this-text-should-be-green.xht
+at-keywords-000.xht == reference/ref-this-text-should-be-green.xht
+at-keywords-001.xht == reference/ref-this-text-should-be-green.xht
+at-keywords-002.xht == reference/ref-this-text-should-be-green.xht
 at-rule-001.xht == reference/filler-text-below-green.xht
 at-rule-002.xht == reference/filler-text-below-green.xht
 at-rule-003.xht == reference/filler-text-below-green.xht
@@ -485,8 +536,15 @@ at-rule-009.xht == reference/filler-text-below-green.xht
 at-rule-010.xht == reference/filler-text-below-green.xht
 at-rule-011.xht == reference/filler-text-below-green.xht
 at-rule-012.xht == reference/filler-text-below-green.xht
+at-rule-013.xht == reference/at-rule-013-ref.xht
+at-rules-000.xht == reference/ref-this-text-should-be-green.xht
+at-rules-001.xht == reference/ref-this-text-should-be-green.xht
+at-rules-002.xht == reference/ref-this-text-should-be-green.xht
+at-rules-003.xht == reference/ref-this-text-should-be-green.xht
+at-rules-004.xht == reference/ref-this-text-should-be-green.xht
 attribute-selector-001.xht == reference/no-red-filler-text-ref.xht
 attribute-selector-002.xht == reference/filler-text-below-green.xht
+attribute-token-selector-002.xht == reference/attribute-token-selector-002-ref.xht
 attribute-value-selector-004.xht == reference/no-red-filler-text-ref.xht
 attribute-value-selector-005.xht == reference/filler-text-below-green.xht
 attribute-value-selector-006.xht == reference/filler-text-below-green.xht
@@ -1013,6 +1071,7 @@ before-content-display-018.xht == reference/after-content-display-001-ref.xht
 bidi-001.xht == reference/bidi-001-ref.xht
 bidi-002.xht == reference/bidi-002-ref.xht
 bidi-003.xht == reference/bidi-003-ref.xht
+bidi-004.xht == reference/bidi-004-ref.xht
 bidi-005a.xht == reference/bidi-005a-ref.xht
 bidi-005b.xht == reference/bidi-005b-ref.xht
 bidi-006a.xht == reference/bidi-005a-ref.xht
@@ -1180,6 +1239,7 @@ block-replaced-height-006.xht == reference/block-replaced-height-006-ref.xht
 block-replaced-height-007.xht == reference/block-replaced-height-004-ref.xht
 block-replaced-width-002.xht == reference/block-replaced-width-002-ref.xht
 block-replaced-width-006.xht == reference/block-replaced-width-006-ref.xht
+blocks-001.xht == reference/blocks-001-ref.xht
 blocks-002.xht == reference/filler-text-below-green.xht
 blocks-003.xht == reference/filler-text-below-green.xht
 blocks-004.xht == reference/no-red-filler-text-ref.xht
@@ -2471,6 +2531,7 @@ c541-word-sp-001.xht == reference/c541-word-sp-001-ref.xht
 c542-letter-sp-000.xht == reference/c542-letter-sp-000-ref.xht
 c542-letter-sp-001.xht == reference/c542-letter-sp-001-ref.xht
 c544-valgn-001.xht == reference/c544-valgn-001-ref.xht
+c547-indent-000.xht == reference/c547-indent-000-ref.xht
 c547-indent-001.xht == reference/c547-indent-001-ref.xht
 c548-leadin-000.xht == reference/c548-leadin-000-ref.xht
 c548-ln-ht-000.xht == reference/c548-ln-ht-000-ref.xht
@@ -2533,6 +2594,7 @@ c5509-padn-l-001.xht == reference/c5509-padn-l-001-ref.xht
 c5509-padn-l-002.xht == reference/c5509-padn-l-002-ref.xht
 c5509-padn-l-003.xht == reference/c5509-padn-l-003-ref.xht
 c5510-ipadn-000.xht == reference/c5510-ipadn-000-ref.xht
+c5510-padn-000.xht == reference/c5510-padn-000-ref.xht
 c5510-padn-001.xht == reference/c5510-padn-001-ref.xht
 c5510-padn-002.xht == reference/c5510-padn-002-ref.xht
 c5511-brdr-tw-001.xht == reference/c5511-brdr-tw-001-ref.xht
@@ -2585,6 +2647,20 @@ cascade-009.xht == reference/filler-text-below-green.xht
 cascade-009a.xht == reference/cascade-009a-ref.xht
 cascade-009b.xht == reference/cascade-009b-ref.xht
 cascade-012.xht == reference/cascade-012-ref.xht
+cascade-import-dynamic-001.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-002.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-003.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-004.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-005.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-006.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-control.xht == reference/ref-this-text-should-be-green.xht
+case-sensitive-000.xht == reference/ref-green-background.xht
+case-sensitive-001.xht == reference/ref-green-background.xht
+case-sensitive-003.xht == reference/case-sensitive-003-ref.xht
+case-sensitive-004.xht == reference/case-sensitive-003-ref.xht
+case-sensitive-005.xht == reference/case-sensitive-005-ref.xht
+case-sensitive-006.xht == reference/filler-text-below-green.xht
+case-sensitive-007.xht == reference/no-red-filler-text-ref.xht
 charset-attr-001.xht == reference/at-charset-ref.xht
 class-selector-001.xht == reference/no-red-filler-text-ref.xht
 class-selector-002.xht == reference/filler-text-below-green.xht
@@ -2679,6 +2755,7 @@ clip-099.xht == reference/no-red-on-blank-page-ref.xht
 clip-102.xht == reference/no-red-on-blank-page-ref.xht
 collapsing-border-model-010a.xht == reference/ref-filled-green-100px-square.xht
 collapsing-border-model-010b.xht == reference/ref-filled-green-100px-square.xht
+color-000.xht == reference/color-000-ref.xht
 color-001.xht == reference/color-001-ref.xht
 color-002.xht == reference/color-002-ref.xht
 color-003.xht == reference/color-003-ref.xht
@@ -2846,6 +2923,7 @@ colors-002.xht == reference/no-red-filler-text-ref.xht
 colors-003.xht == reference/no-red-filler-text-ref.xht
 colors-004.xht == reference/no-red-filler-text-ref.xht
 colors-005.xht == reference/filler-text-below-green.xht
+colors-006.xht == reference/colors-006-ref.xht
 colors-007.xht == reference/colors-007-ref.xht
 column-visibility-004.xht == reference/column-visibility-004-ref.xht
 combinator-001.xht == reference/filler-text-below-green.xht
@@ -2889,12 +2967,53 @@ content-173.xht == reference/content-173-ref.xht
 content-174.xht == reference/content-174-ref.xht
 content-175.xht == reference/content-175-ref.xht
 content-177.xht == reference/content-177-ref.xht
+content-counter-000.xht == reference/content-counter-000-ref.xht
+content-counter-001.xht == reference/content-counter-001-ref.xht
+content-counter-002.xht == reference/content-counter-002-ref.xht
+content-counter-003.xht == reference/content-counter-003-ref.xht
+content-counter-004.xht == reference/content-counter-004-ref.xht
+content-counter-005.xht == reference/content-counter-000-ref.xht
+content-counter-006.xht == reference/content-counter-006-ref.xht
+content-counter-007.xht == reference/content-counter-007-ref.xht
+content-counter-008.xht == reference/content-counter-008-ref.xht
+content-counter-009.xht == reference/content-counter-009-ref.xht
+content-counter-010.xht == reference/content-counter-010-ref.xht
+content-counter-011.xht == reference/content-counter-011-ref.xht
+content-counter-012.xht == reference/content-counter-011-ref.xht
+content-counter-013.xht == reference/content-counter-013-ref.xht
+content-counter-014.xht == reference/content-counter-013-ref.xht
+content-counter-015.xht == reference/content-counter-015-ref.xht
+content-counter-016.xht == reference/content-counter-000-ref.xht
 content-inherit-002.xht == reference/content-inherit-002-ref.xht
 content-type-000.xht == reference/content-type-000-ref.xht
 content-type-001.xht == reference/content-type-000-ref.xht
+core-syntax-001.xht == reference/core-syntax-001-ref.xht
+core-syntax-002.xht == reference/core-syntax-002-ref.xht
+core-syntax-003.xht == reference/ref-this-text-should-be-green.xht
+core-syntax-004.xht == reference/ref-this-text-should-be-green.xht
+core-syntax-006.xht == reference/core-syntax-006-ref.xht
+core-syntax-007.xht == reference/core-syntax-007-ref.xht
+core-syntax-008.xht == reference/ref-this-text-should-be-green.xht
+core-syntax-009.xht == reference/ref-this-text-should-be-green.xht
 counter-reset-increment-002.xht == reference/counter-reset-increment-002-ref.xht
+counters-001.xht == reference/counters-001-ref.xht
 counters-002.xht == reference/no-red-filler-text-ref.xht
+counters-003.xht == reference/counters-003-ref.xht
+counters-004.xht == reference/counters-004-ref.xht
+counters-005.xht == reference/counters-003-ref.xht
+counters-006.xht == reference/counters-004-ref.xht
+counters-007.xht == reference/counters-003-ref.xht
+counters-008.xht == reference/counters-004-ref.xht
+counters-009.xht == reference/counters-003-ref.xht
+counters-010.xht == reference/counters-010-ref.xht
+declaration-001.xht == reference/ref-this-text-should-be-green.xht
+declaration-002.xht == reference/ref-this-text-should-be-green.xht
+declaration-003.xht == reference/ref-this-text-should-be-green.xht
+declaration-004.xht == reference/ref-this-text-should-be-green.xht
+declaration-005.xht == reference/ref-this-text-should-be-green.xht
+declaration-006.xht == reference/ref-this-text-should-be-green.xht
 declaration-whitespace-001.xht == reference/filler-text-below-green.xht
+declarations-009.xht == reference/declarations-009-ref.xht
 default-attribute-selector-001.xht == reference/ref-filled-green-100px-square.xht
 default-attribute-selector-002.xht == reference/ref-filled-green-100px-square.xht
 default-attribute-selector-003.xht == reference/ref-filled-green-100px-square.xht
@@ -2982,6 +3101,22 @@ escaped-ident-spaces-004.xht == reference/filler-text-below-green.xht
 escaped-ident-spaces-005.xht == reference/filler-text-below-green.xht
 escaped-ident-spaces-006.xht == reference/filler-text-below-green.xht
 escaped-ident-spaces-007.xht == reference/filler-text-below-green.xht
+escaped-newline-001.xht == reference/escaped-newline-001-ref.xht
+escapes-000.xht == reference/escapes-000-ref.xht
+escapes-001.xht == reference/ref-green-background.xht
+escapes-002.xht == reference/ref-green-background.xht
+escapes-003.xht == reference/ref-green-background.xht
+escapes-004.xht == reference/ref-green-background.xht
+escapes-005.xht == reference/ref-green-background.xht
+escapes-006.xht == reference/ref-green-background.xht
+escapes-007.xht == reference/ref-green-background.xht
+escapes-008.xht == reference/ref-green-background.xht
+escapes-009.xht == reference/ref-this-text-should-be-green.xht
+escapes-010.xht == reference/ref-this-text-should-be-green.xht
+escapes-011.xht == reference/ref-this-text-should-be-green.xht
+escapes-012.xht == reference/ref-this-text-should-be-green.xht
+escapes-013.xht == reference/escapes-013-ref.xht
+escapes-014.xht == reference/ref-green-background.xht
 escapes-015.xht == reference/ref-if-there-is-no-red.xht
 escapes-016.xht == reference/ref-if-there-is-no-red.xht
 extract-ordered-lists-in-regions-explicit-counters-002.xht == reference/extract-ordered-lists-in-regions-explicit-counters-002-ref.xht
@@ -3282,6 +3417,10 @@ font-family-applies-to-016.xht == reference/ref-if-there-is-no-red.xht
 font-family-applies-to-017.xht == reference/font-family-applies-to-001-ref.xht
 font-family-invalid-characters-001.xht == reference/font-family-invalid-characters-001-ref.xht
 font-family-invalid-characters-002.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-003.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-004.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-005.xht == reference/font-family-invalid-characters-005-ref.xht
+font-family-invalid-characters-006.xht == reference/font-family-invalid-characters-006-ref.xht
 font-family-name-001.xht == reference/font-family-name-ref.xht
 font-family-name-002.xht == reference/font-family-name-ref.xht
 font-family-name-003.xht == reference/font-family-name-ref.xht
@@ -3500,12 +3639,27 @@ id-selector-001.xht == reference/filler-text-below-green.xht
 id-selector-004.xht == reference/no-red-filler-text-ref.xht
 id-selector-005.xht == reference/no-red-filler-text-ref.xht
 id-selector-006.xht == reference/filler-text-below-green.xht
+ident-000.xht == reference/ident-000-ref.xht
+ident-001.xht == reference/ident-000-ref.xht
+ident-002.xht == reference/ident-000-ref.xht
+ident-003.xht == reference/ident-000-ref.xht
+ident-004.xht == reference/ident-000-ref.xht
+ident-005.xht == reference/ident-000-ref.xht
+ident-006.xht == reference/ident-000-ref.xht
+ident-007.xht == reference/ident-000-ref.xht
+ident-008.xht == reference/ident-000-ref.xht
+ident-009.xht == reference/ident-000-ref.xht
+ident-010.xht == reference/ident-000-ref.xht
+ident-011.xht == reference/ident-000-ref.xht
+ident-012.xht == reference/ident-012-ref.xht
+ident-013.xht == reference/ident-000-ref.xht
 ident-014.xht == reference/filler-text-below-green.xht
 ident-015.xht == reference/filler-text-below-green.xht
 ident-016.xht == reference/filler-text-below-green.xht
 ident-017.xht == reference/no-red-filler-text-ref.xht
 ident-018.xht == reference/no-red-filler-text-ref.xht
 ident-019.xht == reference/filler-text-below-green.xht
+ident-020.xht == reference/ident-000-ref.xht
 ignored-rules-001.xht == reference/filler-text-below-green.xht
 ignored-rules-002.xht == reference/filler-text-below-green.xht
 ignored-rules-003.xht == reference/filler-text-below-green.xht
@@ -3513,6 +3667,8 @@ ignored-rules-004.xht == reference/filler-text-below-green.xht
 ignored-rules-005.xht == reference/filler-text-below-green.xht
 ignored-rules-006.xht == reference/filler-text-below-green.xht
 ignored-rules-007.xht == reference/filler-text-below-green.xht
+import-000.xht == reference/ref-this-text-should-be-green.xht
+import-001.xht == reference/ref-this-text-should-be-green.xht
 inherit-static-offset-001.xht == reference/ref-filled-green-100px-square.xht
 inherit-static-offset-002.xht == reference/ref-filled-green-100px-square.xht
 inherit-static-offset-003.xht == reference/ref-filled-green-100px-square.xht
@@ -3661,6 +3817,8 @@ insert-inline-in-blocks-n-inlines-middle-003.xht == reference/insert-inline-in-b
 invalid-at-rule-001.xht == reference/no-red-filler-text-ref.xht
 invalid-decl-at-rule-001.xht == reference/filler-text-below-green.xht
 invalid-decl-at-rule-002.xht == reference/filler-text-below-green.xht
+keywords-000.xht == reference/ref-green-background.xht
+keywords-001.xht == reference/keywords-001-ref.xht
 lang-selector-002.xht == reference/no-red-filler-text-ref.xht
 lang-selector-003.xht == reference/filler-text-below-green.xht
 leading-001.xht == reference/leading-001-ref.xht
@@ -3814,6 +3972,7 @@ line-height-applies-to-016.xht == reference/line-height-applies-to-016-ref.xht
 line-height-bleed-001.xht == reference/line-height-bleed-001-ref.xht
 line-height-bleed-002.xht == reference/line-height-bleed-002-ref.xht
 list-style-019.xht == reference/list-style-019-ref.xht
+list-style-020.xht == reference/list-style-020-ref.xht
 list-style-021.xht == reference/list-style-021-ref.xht
 list-style-image-004.xht == reference/list-style-image-004-ref.xht
 list-style-image-005.xht == reference/list-style-image-005-ref.xht
@@ -4191,6 +4350,9 @@ margin-top-applies-to-012.xht == reference/margin-top-applies-to-012-ref.xht
 margin-top-applies-to-013.xht == reference/margin-top-applies-to-013-ref.xht
 margin-top-applies-to-014.xht == reference/margin-top-applies-to-013-ref.xht
 margin-top-applies-to-015.xht == reference/margin-top-applies-to-013-ref.xht
+matching-brackets-001.xht == reference/matching-brackets-001-ref.xht
+matching-brackets-002.xht == reference/matching-brackets-002-ref.xht
+matching-brackets-003.xht == reference/matching-brackets-001-ref.xht
 max-height-001.xht == reference/ref-filled-black-96px-square.xht
 max-height-002.xht == reference/height-001-ref.xht
 max-height-003.xht == reference/height-003-ref.xht
@@ -4575,9 +4737,22 @@ moz-multicol3-column-balancing-break-inside-avoid-1.xht == reference/moz-multico
 multicol-height-002.xht == reference/multicol-height-002.xht
 numbers-units-001.xht == reference/no-red-on-blank-page-ref.xht
 numbers-units-003.xht == reference/no-red-on-blank-page-ref.xht
+numbers-units-004.xht == reference/ref-filled-black-96px-square.xht
 numbers-units-005.xht == reference/no-red-on-blank-page-ref.xht
+numbers-units-006.xht == reference/ref-filled-black-96px-square.xht
+numbers-units-007.xht == reference/numbers-units-007-ref.xht
+numbers-units-009.xht == reference/numbers-units-009-ref.xht
+numbers-units-010.xht == reference/numbers-units-010-ref.xht
+numbers-units-011.xht == reference/numbers-units-011-ref.xht
+numbers-units-012.xht == reference/numbers-units-012-ref.xht
+numbers-units-013.xht == reference/numbers-units-013-ref.xht
+numbers-units-015.xht == reference/numbers-units-014-ref-a.xht
+numbers-units-015.xht == reference/numbers-units-014-ref-b.xht
 numbers-units-016.xht == reference/no-red-on-blank-page-ref.xht
 numbers-units-017.xht == reference/no-red-on-blank-page-ref.xht
+numbers-units-018.xht == reference/numbers-units-018-ref.xht
+numbers-units-019.xht == reference/numbers-units-019-ref.xht
+numbers-units-021.xht == reference/numbers-units-021-ref.xht
 other-attribute-001.xht == reference/no-red-on-blank-page-ref.xht
 outline-applies-to-005.xht == reference/no-red-on-blank-page-ref.xht
 outline-applies-to-006.xht == reference/no-red-on-blank-page-ref.xht
@@ -5047,6 +5222,10 @@ pseudo-015.xht == reference/no-red-filler-text-ref.xht
 pseudo-016.xht == reference/no-red-filler-text-ref.xht
 quoted-keywords-001.xht == reference/no-red-filler-text-ref.xht
 quoted-keywords-002.xht == reference/no-red-filler-text-ref.xht
+quoted-string-001.xht == reference/quoted-string-001-ref.xht
+quoted-string-002.xht == reference/quoted-string-002-ref.xht
+quoted-string-003.xht == reference/quoted-string-001-ref.xht
+quoted-string-004.xht == reference/quoted-string-002-ref.xht
 quotes-035.xht == reference/quotes-035-ref.xht
 quotes-035a.xht == reference/quotes-035-ref.xht
 quotes-036.xht == reference/quotes-035-ref.xht
@@ -5263,6 +5442,7 @@ run-in-text-between-002.xht == reference/run-in-text-ref.xht
 run-in-text-between-003.xht == reference/run-in-text-ref.xht
 run-in-text-between-004.xht == reference/run-in-basic-ref.xht
 run-in-text-between-005.xht == reference/run-in-basic-ref.xht
+selectors-parsing-001.xht == reference/selectors-parsing-001-ref.xht
 separated-border-model-003a.xht == reference/ref-filled-green-100px-square.xht
 separated-border-model-003b.xht == reference/separated-border-model-003b-ref.xht
 separated-border-model-004a.xht == reference/ref-filled-green-100px-square.xht
@@ -5273,7 +5453,9 @@ separated-border-model-004e.xht == reference/separated-border-model-004e-ref.xht
 separated-border-model-007.xht == reference/separated-border-model-007-ref.xht
 separated-border-model-008.xht == reference/separated-border-model-007-ref.xht
 separated-border-model-009.xht == reference/separated-border-model-007-ref.xht
+sgml-comments-000.xht == reference/ref-this-text-should-be-green.xht
 sgml-comments-001.xht == reference/filler-text-below-green.xht
+sgml-comments-002.xht == reference/sgml-comments-002-ref.xht
 shand-border-000.xht == reference/shand-border-000-ref.xht
 shand-border-001.xht == reference/ref-if-there-is-no-red.xht
 shand-font-000.xht == reference/shand-font-000-ref.xht
@@ -5296,6 +5478,7 @@ stack-floats-001.xht == reference/stack-floats-001-ref.xht
 stack-floats-002.xht == reference/stack-floats-001-ref.xht
 stack-floats-003.xht == reference/stack-floats-001-ref.xht
 stack-floats-004.xht == reference/stack-floats-001-ref.xht
+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
@@ -5458,21 +5641,31 @@ units-001.xht == reference/units-001-ref.xht
 units-002.xht == reference/units-002-ref.xht
 units-003.xht == reference/units-003-ref.xht
 units-004.xht == reference/units-004-ref.xht
+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-003.xht == reference/filler-text-below-green.xht
 universal-selector-004.xht == reference/filler-text-below-green.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
 uri-003.xht == reference/no-red-filler-text-ref.xht
+uri-004.xht == reference/ref-green-background.xht
+uri-005.xht == reference/ref-green-background.xht
 uri-006.xht == reference/no-red-filler-text-ref.xht
 uri-007.xht == reference/no-red-filler-text-ref.xht
 uri-008.xht == reference/no-red-filler-text-ref.xht
 uri-009.xht == reference/no-red-filler-text-ref.xht
 uri-010.xht == reference/no-red-filler-text-ref.xht
 uri-011.xht == reference/no-red-filler-text-ref.xht
+uri-012.xht == reference/uri-012-ref.xht
 uri-013.xht == reference/uri-013-ref.xht
+uri-014.xht == reference/ref-green-background.xht
+uri-015.xht == reference/ref-green-background.xht
+uri-016.xht == reference/uri-016-ref.xht
+uri-017.xht == reference/uri-017-ref.xht
+uri-018.xht == reference/ref-this-text-should-be-green.xht
 vertical-align-004.xht == reference/vertical-align-004-ref.xht
 vertical-align-005.xht == reference/vertical-align-004-ref.xht
 vertical-align-006.xht == reference/vertical-align-004-ref.xht
@@ -5576,6 +5769,8 @@ white-space-pre-002.xht == reference/white-space-pre-002-ref.xht
 white-space-pre-005.xht == reference/white-space-normal-005-ref.xht
 white-space-pre-006.xht == reference/white-space-normal-005-ref.xht
 white-space-processing-049.xht == reference/white-space-processing-049-ref.xht
+whitespace-001.xht == reference/no-red-filler-text-ref.xht
+whitespace-002.xht == reference/no-red-filler-text-ref.xht
 width-001.xht == reference/ref-if-there-is-no-red.xht
 width-002.xht == reference/ref-if-there-is-no-red.xht
 width-003.xht == reference/max-width-003-ref.xht
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/selectors-parsing-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/selectors-parsing-001.xht
index fd94a7eba3f..6dbf24dd469 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/selectors-parsing-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/selectors-parsing-001.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/parsing/001.xml" type="application/xhtml+xml"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/selectors-parsing-001-ref.xht"/>
   <style type="text/css">
    p { background: white; color: green; }
    p:invalidPseudoClass, p.test1 { color: yellow; background: red; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-000.xht
index 606882db254..c9edad15e87 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: SGML comments</title>
   <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#comments"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="UAs must ignore SGML comment delimiters between statements."/>
 <style type="text/css"><![CDATA[
@@ -15,7 +16,7 @@ p {color: green}
  </head>
  <body>
 
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-002.xht
index 475879b5e39..0c8cfd107bd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/sgml-comments-002.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/cdocdc/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#comments" />
+  <link rel="match" href="reference/sgml-comments-002-ref.xht" />
   <style type="text/css"><![CDATA[
     <!--
     .a { color: green; } -->
@@ -14,8 +15,8 @@
   ]]></style>
  </head>
  <body>
-  <p class="a">This line should be green.</p>
-  <p class="b">This line should be green.</p>
-  <p class="c">This line should be green.</p>
+  <p class="a">This text should be green.</p>
+  <p class="b">This text should be green.</p>
+  <p class="c">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/strings-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1/strings-000.xht
index 8678ff494e2..9629d8f52c5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/strings-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/strings-000.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Newlines in strings</title>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
     p { color: red }
     p[title="this is\
@@ -11,6 +12,6 @@
   </style>
  </head>
  <body>
-  <p title="this is a test">This should be green</p>
+  <p title="this is a test">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
index 463551ff295..1654398202f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         Syntax and basic data types</a></th>
-      <td>(439 Tests)</td></tr>
+      <td>(438 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
@@ -57,17 +57,17 @@
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
         Box model</a></th>
-      <td>(2326 Tests)</td></tr>
+      <td>(2327 Tests)</td></tr>
     </tbody>
     <tbody id="s9">
       <tr><th><a href="chapter-9.xht">Chapter 9 - 
         Visual formatting model</a></th>
-      <td>(1245 Tests)</td></tr>
+      <td>(1246 Tests)</td></tr>
     </tbody>
     <tbody id="s10">
       <tr><th><a href="chapter-10.xht">Chapter 10 - 
         Visual formatting model details</a></th>
-      <td>(1481 Tests)</td></tr>
+      <td>(1449 Tests)</td></tr>
     </tbody>
     <tbody id="s11">
       <tr><th><a href="chapter-11.xht">Chapter 11 - 
@@ -97,7 +97,7 @@
     <tbody id="s16">
       <tr><th><a href="chapter-16.xht">Chapter 16 - 
         Text</a></th>
-      <td>(608 Tests)</td></tr>
+      <td>(609 Tests)</td></tr>
     </tbody>
     <tbody id="s17">
       <tr><th><a href="chapter-17.xht">Chapter 17 - 
@@ -107,7 +107,7 @@
     <tbody id="s18">
       <tr><th><a href="chapter-18.xht">Chapter 18 - 
         User interface</a></th>
-      <td>(360 Tests)</td></tr>
+      <td>(361 Tests)</td></tr>
     </tbody>
     <tbody id="sA">
       <tr><th><a href="chapter-A.xht">Appendix A - 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/units-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/units-005.xht
index 1405dbe0de3..eb3f885cc0d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/units-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/units-005.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/units/005.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+  <link rel="match" href="reference/units-005-ref.xht" />
 
   <style type="text/css">
    div { width: 8.7em; height: 8.7em; background: red; border: solid lime; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/unterminated-string-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/unterminated-string-001.xht
index 33cb11b1c65..fa3e519a7ea 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/unterminated-string-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/unterminated-string-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Error handling of unterminated strings</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="When the parser encounters an unterminated string, the parser drops everything up to the next ';'." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/uri-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-004.xht
index 5d9ea9b89e2..f6e0faf26b9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-004.xht
@@ -4,17 +4,18 @@
         <title>CSS Test: URL function with URI that has escaped special chars</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri" />
+        <link rel="match" href="reference/ref-green-background.xht" />
         <meta name="flags" content="image" />
         <meta name="assert" content="URI escapes are allowed in URL functions." />
         <style type="text/css">
-            div
+            p
             {
+                color: white;
                 background: red url(support/%27green%20block.png);
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the box below is green.</p>
-        <div>Filler Text</div>
+        <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/uri-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-005.xht
index b5191cc88b9..22129195c75 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-005.xht
@@ -4,17 +4,18 @@
         <title>CSS Test: URL function with escaped special chars - single quote</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri" />
+        <link rel="match" href="reference/ref-green-background.xht" />
         <meta name="flags" content="image" />
         <meta name="assert" content="Single quote characters appearing in an unquoted URI need to be escaped with a backslash so that the resulting URI value is a URI token." />
         <style type="text/css">
-            div
+            p
             {
+                color: white;
                 background: red url(support/\'green\ block.png);
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the box below is green.</p>
-        <div>Filler Text</div>
+        <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/uri-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-012.xht
index 40480a68845..f1b6e0cb058 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-012.xht
@@ -6,6 +6,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/uri/010.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri" />
+  <link rel="match" href="reference/uri-012-ref.xht" />
   <meta name="flags" content="invalid" />
   <style>
    .control {
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/uri-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-014.xht
index 4392ed30d2b..74b83dd5114 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-014.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Unquoted commas in url()</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Unquoted commas inside url() are valid."/>
   <style type="text/css"><![CDATA[
@@ -15,6 +16,6 @@
   ]]></style>
  </head>
  <body>
-  <p>This sentence must have a green background.</p>
+  <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/uri-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-015.xht
index 3d3bb9d7f9f..e34c210dfb2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-015.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Escaped url() functional notation</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="url() notation is case-insensitive and can be escaped."/>
   <style type="text/css"><![CDATA[
@@ -15,6 +16,6 @@
   ]]></style>
  </head>
  <body>
-  <p>This sentence must have a green background.</p>
+  <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/uri-016.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-016.xht
index 970d279a4de..9cb92a0c0be 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-016.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-016.xht
@@ -6,6 +6,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/uri/007.html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri"/>
+  <link rel="match" href="reference/uri-016-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Comments are just regular tokens inside      unquoted URLs."/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/uri-017.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-017.xht
index 52f0c40a2a0..711236b0ed8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-017.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-017.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Unclosed URI Token at EOF (in declaration)</title>
   <link rel="author" title="Bert Bos" href="mailto:bert@w3.org"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/uri-017-ref.xht"/>
   <meta name="flags" content="invalid image"/>
   <meta name="assert" content="User agents must close open URI constructs and style rules at the end of the style sheet."/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/uri-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1/uri-018.xht
index ccbf94147a8..a04eb4091b9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/uri-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/uri-018.xht
@@ -4,6 +4,7 @@
   <title>CSS Test: Unclosed URI Token at EOF (in @import)</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid image"/>
   <meta name="assert" content="User agents must close open URI constructs and statements at the end of the style sheet."/>
   <style type="text/css">
@@ -11,6 +12,6 @@
     p { color: red; }
  </head>
  <body>
-  <p class="import">This sentence must be green.</p>
+  <p class="import">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-002a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-002a.xht
deleted file mode 100644
index 24def26b4e6..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-002a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-002b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-002b.xht
deleted file mode 100644
index 347a0e57e3c..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-002b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'baseline' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-003a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-003a.xht
deleted file mode 100644
index c762505e832..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-003a.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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-003b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-003b.xht
deleted file mode 100644
index 4e0b09a1606..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-003b.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: vertical align - 'baseline' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-005a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-005a.xht
deleted file mode 100644
index cdc837130eb..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-005a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-005b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-005b.xht
deleted file mode 100644
index 1465a3efa27..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-005b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'sub' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-008a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-008a.xht
deleted file mode 100644
index 347b0d77fdb..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-008a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-008b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-008b.xht
deleted file mode 100644
index 274a4370161..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-008b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'super' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-011a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-011a.xht
deleted file mode 100644
index 3d8fe462502..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-011a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-011b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-011b.xht
deleted file mode 100644
index 4ac7e74083a..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-011b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-012l.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-012l.xht
deleted file mode 100644
index 742df4cb701..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-012l.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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-012r.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-012r.xht
deleted file mode 100644
index 92df052439a..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-012r.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: vertical align - 'zero length (0em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-014a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-014a.xht
deleted file mode 100644
index 38521e02b5d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-014a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-014b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-014b.xht
deleted file mode 100644
index e030074b75d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-014b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-015a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-015a.xht
deleted file mode 100644
index d4edf12be1f..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-015a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-015b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-015b.xht
deleted file mode 100644
index 63fcd72f9bf..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-015b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive length (0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-017a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-017a.xht
deleted file mode 100644
index 6179f07ab06..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-017a.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-017b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-017b.xht
deleted file mode 100644
index 38fbff0b7ba..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-017b.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-018a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-018a.xht
deleted file mode 100644
index 3402f3a6e2c..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-018a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-018b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-018b.xht
deleted file mode 100644
index c2b0721c546..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-018b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-020a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-020a.xht
deleted file mode 100644
index 2fee81e5651..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-020a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-020b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-020b.xht
deleted file mode 100644
index f2a9fdd1fcd..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-020b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-021a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-021a.xht
deleted file mode 100644
index 06cc31cafd9..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-021a.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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-021b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-021b.xht
deleted file mode 100644
index 164878cbb1e..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-021b.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: vertical align - 'zero percentage (0%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-023a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-023a.xht
deleted file mode 100644
index a6d090b2217..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-023a.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-023b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-023b.xht
deleted file mode 100644
index 27b6de4d61d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-023b.xht
+++ /dev/null
@@ -1,67 +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: vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-024a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-024a.xht
deleted file mode 100644
index 8349488967d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-024a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-024b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-024b.xht
deleted file mode 100644
index 775a8db8c7d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-024b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'positive percentage (50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-026a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-026a.xht
deleted file mode 100644
index 81aff9b7eb4..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-026a.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-026b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-026b.xht
deleted file mode 100644
index 0290befe85a..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-026b.xht
+++ /dev/null
@@ -1,68 +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: vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-027a.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-027a.xht
deleted file mode 100644
index 14beed6e4e2..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-027a.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-027b.xht b/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-027b.xht
deleted file mode 100644
index 15732ad18e7..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1/vertical-alignment-027b.xht
+++ /dev/null
@@ -1,64 +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: vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-001.xht
index c49d1513d30..2eb9f4d3726 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: White space - em-space (U+2003)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Em-space is not treated as white space." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-002.xht
index 2e804abd64a..b771801406f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/whitespace-002.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: White space - ideographic space (U+3000)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Ideographic space is not treated as white space." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-001.xht
index 30af0c98f0c..1be1cb35805 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-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/syndata.html#charset" />
+        <link rel="match" href="reference/at-charset-001-ref.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The Byte Order Mark in the stylesheet overrides the HTTP charset setting." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-002.xht
index e75b5249b6f..4ecb851637a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the @charset designation in the stylesheet." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-003.xht
index 3428b12391a..1f048378929 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the charset designation in the link tag." />
         <link charset="windows-1252" href="support/at-charset-003.css" rel="Stylesheet" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-004.xht
index 2cc09570137..6b8fe787220 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the referring document's code page." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-005.xht
index ef128abc276..694b061d4fe 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-005.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the charset designation in the referring document's meta tag." />
         <meta http-equiv="Content-Type" content="text/html; windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-006.xht
index 8790cdae681..c929f312afb 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="http" />
         <meta name="assert" content="The HTTP charset setting overrides the charset of referring document." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-007.xht
index d13d24c18a8..a6a82509297 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-007.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The @charset setting in the stylesheet overrides the charset attribute of the link element." />
         <link rel="Stylesheet" href="support/at-charset-007.css" charset="windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-008.xht
index 3b6d1339abd..c171b99a444 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-008.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The @charset setting in the stylesheet overrides the referring document's set code page." />
         <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-009.xht
index 372b3326e5a..71e5b649b57 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-009.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The @charset setting in the stylesheet overrides the referring document's unset code page." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-010.xht
index b4993e9a3c7..c5ed1c9a15d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-010.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page." />
         <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-011.xht
index 043e6498a67..5e663123796 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-011.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet's encoding is determined by the link element's charset attribute and not the referring document's code page." />
         <link rel="stylesheet" href="support/at-charset-011.css" charset="shift-JIS" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-012.xht
index c60198baa46..58fc9543c94 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-012.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet's encoding is determined by the set encoding of the referring document." />
         <meta http-equiv="Content-Type" content="text/html; charset=shift-JIS" />
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-014.xht
index bd556c7dda4..717ed3d4145 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-014.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-015.xht
index a42fddcc7b9..36e7d585c05 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-015.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-016.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-016.xht
index a3c3a6d9424..f716e645697 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-016.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-016.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The encoding is correctly interpreted from the matched BOM and @charset." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-019.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-019.xht
index e8ab0a35260..5167a934a2e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-019.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-019.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-8." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-020.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-020.xht
index d3ad4c30e12..ed54d8f00e0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-020.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-020.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-16LE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-021.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-021.xht
index 6438bd7f465..b7a28f53c05 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-021.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-021.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as utf-16BE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-024.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-024.xht
index 52acf742925..891a6505b4d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-024.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-024.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as windows-1252." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-025.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-025.xht
index 1367b686878..2a817c5c14f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-025.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-025.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as Shift-JIS." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-026.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-026.xht
index 7a803647476..104e278f895 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-026.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-026.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as ISO-8859-6." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-027.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-027.xht
index 69ef6e7b702..f41369fb782 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-027.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-027.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as Big5." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-028.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-028.xht
index 6b6ef3bfb04..7593d46ef5d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-028.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-028.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is correctly interpreted as UTF-8." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-029.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-029.xht
index 06664355d17..daf5c36d836 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-029.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-029.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16LE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-030.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-030.xht
index 81e49039d74..063ecc74e3c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-030.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-030.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16BE." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-040.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-040.xht
index 062e1bf3590..6c28d045d44 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-040.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-040.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is thrown out due to the mismatched @charset." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-041.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-041.xht
index 5cba775d12c..9f12c578ec9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-041.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-041.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is thrown out due to the mismatched @charset." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-042.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-042.xht
index 821542e2254..2da4207791a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-042.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-042.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-8." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-043.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-043.xht
index 63d2616fdc0..616f896aab3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-043.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-043.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-8." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-044.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-044.xht
index 77ab4facbef..51da082602f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-044.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-044.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="UTF-32 is not supported." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-045.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-045.xht
index 47c8db3aa8a..8c8f4c3b3f6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-045.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-045.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-16LE." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-046.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-046.xht
index 56d7b1c598a..b6c1a09eb41 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-046.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-046.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF16BE." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-047.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-047.xht
index 89aabfe9134..5e7cfbd566d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-047.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-047.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF-16LE." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-048.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-048.xht
index c803069cc4d..650df6b2c08 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-048.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-048.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is not interpreted as UTF16-BE." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="星期二价泌">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-054.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-054.xht
index c33fb4c3965..74cb266f82a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-054.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-054.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/syndata.html#charset" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The selector does not match due to the @charset being ignored." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-056.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-056.xht
index a4645408009..794c2512dc0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-056.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-056.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/syndata.html#charset" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The selector does not match due to the @charset being ignored." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-060.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-060.xht
index 8b3c9f74d94..0c437dc9a9b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-060.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-060.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/syndata.html#charset" />
+        <link rel="match" href="at-charset-001.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The stylesheet is interpreted as UTF-16LE based on BOM." />
         <style type="text/css">
@@ -24,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the "Filler Text" below is green.</p>
+        <p>Test passes if both lines of "Filler Text" below are green.</p>
         <div class="平和">Filler Text</div>
         <div id="div1">Filler Text</div>
     </body>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-061.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-061.xht
index 3be6b715ca1..0bd09ad68bd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-061.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-061.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/syndata.html#charset" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The selector does not match due to the @charset being ignored." />
         <style type="text/css">@charset "ISO-8859-1";
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-071.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-071.xht
index f4caaa12605..8c7a037d49a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-071.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-071.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-071.css" />
  </head>
  <body>
-  <p class="t&#233;st">This line should be green.</p>
+  <p class="t&#233;st">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/at-charset-072.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-072.xht
index 9f73848061c..17d6c252c7b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-072.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-072.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/002.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-072.css" />
  </head>
  <body>
-  <p class="t&#3657;st">This line should be green.</p>
+  <p class="t&#3657;st">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/at-charset-073.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-073.xht
index 377b08ae598..82a5af7e007 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-073.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-073.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/003.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-073.css" />
  </head>
  <body>
-  <p class="t&#1097;st">This line should be green.</p>
+  <p class="t&#1097;st">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/at-charset-074.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-074.xht
index b54d00402de..2787cd815a1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-074.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-074.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/004.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-074.css" />
  </head>
  <body>
-  <p class="t&#1609;st">This line should be green.</p>
+  <p class="t&#1609;st">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/at-charset-075.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-075.xht
index 398130e4758..9976fb85685 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-075.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-075.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/005.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-075.css" />
  </head>
  <body>
-  <p class="t&#953;st">This line should be green.</p>
+  <p class="t&#953;st">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/at-charset-076.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-076.xht
index 0b10aabe5aa..635b0f5d680 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-076.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-076.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/006.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-076.css" />
  </head>
  <body>
-  <p class="t&#1497;st">This line should be green.</p>
+  <p class="t&#1497;st">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/at-charset-077.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-077.xht
index 81810e5e9f4..a7a68a7c909 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-077.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-charset-077.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/encoding/007.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#charset" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <meta name="flags" content="http" />
   <style type="text/css">
    p { background: red; color: yellow; }
@@ -21,6 +22,6 @@
   <link rel="stylesheet" href="support/at-charset-077.css" />
  </head>
  <body>
-  <p class="t&#1048;st">This line should be green.</p>
+  <p class="t&#1048;st">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/at-import-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-009.xht
index 96bcc5889af..d6a3c4ff123 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-009.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules" />
+        <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="@import is respected after known but ignored @rule." />
         <style type="text/css">
@@ -23,6 +24,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-010.xht
index f4ae709188a..62469a4eff5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-010.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules" />
+        <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="@import is respected after invalid (ignored) rule set" />
         <style type="text/css">
@@ -22,6 +23,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-011.xht
index 4b6dd527de1..857fc462180 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-import-011.xht
@@ -13,6 +13,7 @@
 </style>
         <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules" />
+        <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="@import is parsed as part of invalid ruleset           after garbage." />
         <style type="text/css">
@@ -23,6 +24,6 @@
         </style>
     </head>
     <body>
-        <p class="import">This sentence must be green.</p>
+        <p class="import">This text should be green.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-000.xht
index dcbba369545..43cb6de4341 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   @import "support/import-green.css";
@@ -23,7 +24,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-001.xht
index ca32a1974b1..e2b0bd3358a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   @ import "support/import-red.css";
@@ -25,7 +26,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-002.xht
index f15b97854ba..f0b398f4285 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-keywords-002.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
@@ -24,7 +25,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rule-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rule-013.xht
index 49ce2caa519..532b21359a5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rule-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rule-013.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/at-rule-013-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="At-rules inside @media blocks are ignored up to         up to the end of the block that contains the invalid at-keyword, or up         to and including the next semicolon (;) or up to and including the next         block ({...}), whichever comes first."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-000.xht
index 2d0d6d56bec..9a698f038b8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
@@ -26,7 +27,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-001.xht
index 765b1fe36d3..7ac363429f1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: red; }
@@ -25,7 +26,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-002.xht
index c79bf5a721b..2d2c04b345b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-002.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: red; }
@@ -25,7 +26,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-003.xht
index ea9ee96c418..8e7fbb22762 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-003.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: red; }
@@ -25,7 +26,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-004.xht
index c0862a0afd0..ce75e635367 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/at-rules-004.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
 
   p { color: green; }
@@ -25,7 +26,7 @@
  </head>
  <body>
 
- <p>This should be green.</p>
+ <p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/attribute-token-selector-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/attribute-token-selector-002.xht
index d4070330226..3b9229f2899 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/attribute-token-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/attribute-token-selector-002.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization"/>
+  <link rel="match" href="reference/attribute-token-selector-002-ref.xht"/>
   <meta name="assert" content="[attr~=''] is valid but matches nothing."/>
   <style type="text/css">
     p {
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/bidi-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/bidi-004.xht
new file mode 100644
index 00000000000..58572badd00
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/bidi-004.xht
@@ -0,0 +1,53 @@
+<!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" lang="en" xml:lang="en">
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>CSS Test: The bidi algorithm and inlines in CSS</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 bidi-004"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
+  <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html" type="text/html" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#white-space-rules" />
+    <!-- Spaces are collapsed, then reordered, then trimmed. -->
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+
+  <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="http://unicode.org/reports/tr9/" />
+  <link rel="help" href="http://www.w3.org/TR/html5/rendering.html#phrasing-content-0" /> <!-- <br> is a bidi paragraph separator -->
+  <link rel="match" href="reference/bidi-004-ref.xht" />
+
+  <meta name="flags" content="may21 ahem" />
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .test { border: solid; padding: 0.4em 1em; line-height: 3em; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <!-- (note that everything between the RLO to the PDF is backwards) -->
+                          <!-- line 1...................--> <!-- line 2........................................--> <!-- line 3...................-->
+    <span class="test a"> pppp pppX ppXp ‮ ppXp XXpp XppX </span> pppX XXXp pXXp <span class="test b"> XpXp ppXX XXpX pXpX ‬ XXpX XXXp </span>
+   </p>
+  </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/blocks-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/blocks-001.xht
index 3551c283c92..cb16524f2f7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/blocks-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/blocks-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/syndata.html#block" />
+        <link rel="match" href="reference/blocks-001-ref.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="Blocks and strings are parsed with matching terminating pairs." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/c547-indent-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/c547-indent-000.xht
index 02981337e99..3f87e58d1f7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/c547-indent-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/c547-indent-000.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/REC-CSS1#text-indent"/>
   <link rel="author" title="CSS1 Test Suite Contributors" href="http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html"/>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="match" href="reference/c547-indent-000-ref.xht"/>
   <style type="text/css"><![CDATA[
    div { font: 24px/1 Ahem; width: 18em; color: blue; }
    .one {text-indent: 0.25in;}
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/c5510-padn-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/c5510-padn-000.xht
index fa4e3e759fa..8d578f41766 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/c5510-padn-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/c5510-padn-000.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/REC-CSS1#padding"/>
   <link rel="author" title="CSS1 Test Suite Contributors" href="http://www.w3.org/Style/CSS/Test/CSS1/current/tsack.html"/>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="match" href="reference/c5510-padn-000-ref.xht"/>
 
   <style type="text/css"><![CDATA[
    body { color: navy; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-001.xht
index ba700b78bd7..910384a3c74 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-001.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript">
    var style = document.createElement("style");
    var text = document.createTextNode("body { color: red; }");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-002.xht
index 0edc01ca824..45181763e8b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-002.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript">
    var style = document.createElementNS("http://www.w3.org/1999/xhtml", "link");
    style.setAttribute("type", "text/css");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-003.xht
index 2e45ab1bd45..fc2d5dba42b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-003.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript" id="script">
    var style = document.createElement("style");
    var text = document.createTextNode("body { color: red }");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-004.xht
index 2ba728bd52c..38ad7c67a8e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-004.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <script type="text/javascript" id="script">
    var style = document.createElementNS("http://www.w3.org/1999/xhtml", "link");
    style.setAttribute("type", "text/css");
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-005.xht
index 5b772d6d8eb..bf505322194 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-005.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css" id="style">
    body { color: blue }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-006.xht
index 33f827593e5..f19a29e779a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-006.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <link rel="stylesheet" type="text/css" id="link" href="support/import-red.css"/>
   <script type="text/javascript">
    document.getElementsByTagName("head")[0].removeChild(document.getElementById("link"));
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-control.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-control.xht
index 2429d0a2ff9..535b9822a66 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-control.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/cascade-import-dynamic-control.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="reviewer" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css" id="test">
    p { color: red; }
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-000.xht
index bce546a0d51..e4265491cc4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-001.xht
index 2ff2703cb91..c08bd2b0d8d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-003.xht
index ac7ee0e729d..1d70e4f1ce8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-003.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/case-sensitive-003-ref.xht"/>
   <meta name="assert" content="Pseudo-class and pseudo-element names are ASCII         case-insensitive."/>
   <style type="text/css">
     * { color: red; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-004.xht
index d23a56cf51c..4f94af7a48b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-004.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters" />
+  <link rel="match" href="reference/case-sensitive-003-ref.xht" />
   <meta name="assert" content="The argument to :lang() is ASCII case-insensitive." />
   <style type="text/css">
     .test-folding { color: red; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-005.xht
index 5c45a69a02c..24eedaf76af 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-005.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/case-sensitive-005-ref.xht"/>
   <meta name="assert" content="Counter names are case-sensitive."/>
   <style type="text/css">
     .reset { counter-reset: test 5 tEsT 9; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-007.xht
index 5f2e9fa3134..1e66438ee00 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/case-sensitive-007.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/syndata.html#characters" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
         <meta name="flags" content="nonHTML" />
         <meta name="assert" content="Element selectors are case-sensitive in XHTML and XML." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-10.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-10.xht
index c6002bb29e5..5fa00bce9af 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-10.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-10.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model details (1481 tests)</h2>
+  <h2>Visual formatting model details (1449 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -19736,7 +19736,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s10.8">+</a>
         <a href="http://www.w3.org/TR/CSS21/visudet.html#line-height">10.8 Line height calculations: the 'line-height' and 'vertical-align' properties</a></th></tr>
-      <!-- 56 tests -->
+      <!-- 24 tests -->
       <tr id="c43-center-000-10.8" class="ahem image">
         <td>
             <a href="c43-center-000.xht">c43-center-000</a></td>
@@ -19944,358 +19944,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="vertical-alignment-002a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-002a.xht">vertical-alignment-002a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-002b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-002b.xht">vertical-alignment-002b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-003a.xht">vertical-alignment-003a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-003b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-003b.xht">vertical-alignment-003b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'baseline' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-005a.xht">vertical-alignment-005a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-005b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-005b.xht">vertical-alignment-005b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'sub' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-008a.xht">vertical-alignment-008a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-008b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-008b.xht">vertical-alignment-008b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'super' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-011a.xht">vertical-alignment-011a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-011b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-011b.xht">vertical-alignment-011b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012l-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-012l.xht">vertical-alignment-012l</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-012r-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-012r.xht">vertical-alignment-012r</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero length (0em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-014a.xht">vertical-alignment-014a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-014b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-014b.xht">vertical-alignment-014b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-015a.xht">vertical-alignment-015a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-015b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-015b.xht">vertical-alignment-015b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-017a.xht">vertical-alignment-017a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-017b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-017b.xht">vertical-alignment-017b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.2em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-018a.xht">vertical-alignment-018a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-018b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-018b.xht">vertical-alignment-018b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-0.5em)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020a-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-020a.xht">vertical-alignment-020a</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-020b-10.8" class="image">
-        <td>
-            <a href="vertical-alignment-020b.xht">vertical-alignment-020b</a></td>
-        <td></td>
-        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-021a.xht">vertical-alignment-021a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-021b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-021b.xht">vertical-alignment-021b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'zero percentage (0%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-023a.xht">vertical-alignment-023a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive length (0.8em)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-023b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-023b.xht">vertical-alignment-023b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (80%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-024a.xht">vertical-alignment-024a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-024b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-024b.xht">vertical-alignment-024b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'positive percentage (50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-026a.xht">vertical-alignment-026a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-026b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-026b.xht">vertical-alignment-026b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative length (-20%)' (alphabetical baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027a-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-027a.xht">vertical-alignment-027a</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
-      <tr id="vertical-alignment-027b-10.8" class="ahem image">
-        <td>
-            <a href="vertical-alignment-027b.xht">vertical-alignment-027b</a></td>
-        <td></td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
-        <td>vertical align - 'negative percentage (-50%)' (central baseline with vertical layout)
-          <ul class="assert">
-            <li>This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
     </tbody>
     <tbody id="s10.8.1">
       <tr><th colspan="4" scope="rowgroup">
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 59c0ef84caf..b9312add45a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-12.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-12.xht
@@ -3811,7 +3811,7 @@
       <tr id="content-counter-000-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-000.xht">content-counter-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -3819,7 +3819,7 @@
       <tr id="content-counter-001-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-001.xht">content-counter-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -3827,7 +3827,7 @@
       <tr id="content-counter-002-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-002.xht">content-counter-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -3835,7 +3835,7 @@
       <tr id="content-counter-003-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-003.xht">content-counter-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -3843,7 +3843,7 @@
       <tr id="content-counter-004-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-004.xht">content-counter-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -3851,7 +3851,7 @@
       <tr id="content-counter-005-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-005.xht">content-counter-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -3859,7 +3859,7 @@
       <tr id="content-counter-006-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-006.xht">content-counter-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -3867,7 +3867,7 @@
       <tr id="content-counter-007-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-007.xht">content-counter-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -3875,7 +3875,7 @@
       <tr id="content-counter-008-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-008.xht">content-counter-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -3883,7 +3883,7 @@
       <tr id="content-counter-009-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-009.xht">content-counter-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -3891,7 +3891,7 @@
       <tr id="content-counter-010-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-010.xht">content-counter-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -3899,7 +3899,7 @@
       <tr id="content-counter-011-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-011.xht">content-counter-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -3907,7 +3907,7 @@
       <tr id="content-counter-012-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-012.xht">content-counter-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -3915,7 +3915,7 @@
       <tr id="content-counter-013-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-013.xht">content-counter-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -3923,7 +3923,7 @@
       <tr id="content-counter-014-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-014.xht">content-counter-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -3931,7 +3931,7 @@
       <tr id="content-counter-015-12.2.#propdef-content" class="primary">
         <td><strong>
             <a href="content-counter-015.xht">content-counter-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -3939,7 +3939,7 @@
       <tr id="content-counter-016-12.2.#propdef-content" class="primary invalid">
         <td><strong>
             <a href="content-counter-016.xht">content-counter-016</a></strong></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
@@ -8835,7 +8835,7 @@
       <tr id="content-counter-000-12.4.2" class="">
         <td>
             <a href="content-counter-000.xht">content-counter-000</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -8843,7 +8843,7 @@
       <tr id="content-counter-001-12.4.2" class="">
         <td>
             <a href="content-counter-001.xht">content-counter-001</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -8851,7 +8851,7 @@
       <tr id="content-counter-002-12.4.2" class="">
         <td>
             <a href="content-counter-002.xht">content-counter-002</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -8859,7 +8859,7 @@
       <tr id="content-counter-003-12.4.2" class="">
         <td>
             <a href="content-counter-003.xht">content-counter-003</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -8867,7 +8867,7 @@
       <tr id="content-counter-004-12.4.2" class="">
         <td>
             <a href="content-counter-004.xht">content-counter-004</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -8875,7 +8875,7 @@
       <tr id="content-counter-005-12.4.2" class="">
         <td>
             <a href="content-counter-005.xht">content-counter-005</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -8883,7 +8883,7 @@
       <tr id="content-counter-006-12.4.2" class="">
         <td>
             <a href="content-counter-006.xht">content-counter-006</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -8891,7 +8891,7 @@
       <tr id="content-counter-007-12.4.2" class="">
         <td>
             <a href="content-counter-007.xht">content-counter-007</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -8899,7 +8899,7 @@
       <tr id="content-counter-008-12.4.2" class="">
         <td>
             <a href="content-counter-008.xht">content-counter-008</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -8907,7 +8907,7 @@
       <tr id="content-counter-009-12.4.2" class="">
         <td>
             <a href="content-counter-009.xht">content-counter-009</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -8915,7 +8915,7 @@
       <tr id="content-counter-010-12.4.2" class="">
         <td>
             <a href="content-counter-010.xht">content-counter-010</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -8923,7 +8923,7 @@
       <tr id="content-counter-011-12.4.2" class="">
         <td>
             <a href="content-counter-011.xht">content-counter-011</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -8931,7 +8931,7 @@
       <tr id="content-counter-012-12.4.2" class="">
         <td>
             <a href="content-counter-012.xht">content-counter-012</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -8939,7 +8939,7 @@
       <tr id="content-counter-013-12.4.2" class="">
         <td>
             <a href="content-counter-013.xht">content-counter-013</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -8947,7 +8947,7 @@
       <tr id="content-counter-014-12.4.2" class="">
         <td>
             <a href="content-counter-014.xht">content-counter-014</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -8955,7 +8955,7 @@
       <tr id="content-counter-015-12.4.2" class="">
         <td>
             <a href="content-counter-015.xht">content-counter-015</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -8963,7 +8963,7 @@
       <tr id="content-counter-016-12.4.2" class="invalid">
         <td>
             <a href="content-counter-016.xht">content-counter-016</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-15.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-15.xht
index d877722c02a..c207241d9e5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-15.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-15.xht
@@ -627,7 +627,7 @@
       <tr id="font-family-invalid-characters-003-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -638,7 +638,7 @@
       <tr id="font-family-invalid-characters-004-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -649,7 +649,7 @@
       <tr id="font-family-invalid-characters-005-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -660,7 +660,7 @@
       <tr id="font-family-invalid-characters-006-15.3" class="primary ahem invalid">
         <td><strong>
             <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-16.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-16.xht
index 021d0fed3ff..e196009c3e7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-16.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-16.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Text (608 tests)</h2>
+  <h2>Text (609 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -41,7 +41,7 @@
       <tr id="c547-indent-000-16.1" class="ahem">
         <td>
             <a href="c547-indent-000.xht">c547-indent-000</a></td>
-        <td></td>
+        <td><a href="reference/c547-indent-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text-indent
         </td>
@@ -9216,7 +9216,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s16.6.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/text.html#white-space-model">16.6.1 The 'white-space' processing model</a></th></tr>
-      <!-- 93 tests -->
+      <!-- 94 tests -->
       <tr id="bidi-001-16.6.1" class="">
         <td>
             <a href="bidi-001.xht">bidi-001</a></td>
@@ -9239,6 +9239,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-16.6.1" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="inlines-016-16.6.1" class="primary ahem">
         <td><strong>
             <a href="inlines-016.xht">inlines-016</a></strong></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-18.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-18.xht
index edebd8c4cc8..c15e07a1eb7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-18.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-18.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>User interface (360 tests)</h2>
+  <h2>User interface (361 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="#s18.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/ui.html#cursor-props">18.1 Cursors: the 'cursor' property</a></th></tr>
-      <!-- 41 tests -->
+      <!-- 42 tests -->
       <tr id="cursor-001-18.1" class="image interact">
         <td>
             <a href="cursor-001.xht">cursor-001</a></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-4.xht
index ef260f0c590..17106eb3376 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-4.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-4.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Syntax and basic data types (439 tests)</h2>
+  <h2>Syntax and basic data types (438 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -35,7 +35,7 @@
       <tr id="counters-001-4" class="primary">
         <td><strong>
             <a href="counters-001.xht">counters-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter functions with just the identifier
           <ul class="assert">
@@ -138,7 +138,7 @@
       <tr id="attribute-token-selector-002-4.1.1" class="primary">
         <td><strong>
             <a href="attribute-token-selector-002.xht">attribute-token-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/attribute-token-selector-002-ref.xht">=</a> </td>
         <td></td>
         <td>[attr~=&quot;&quot;]Attribute Selectors with Empty String Values
           <ul class="assert">
@@ -149,7 +149,7 @@
       <tr id="core-syntax-009-4.1.1" class="primary">
         <td><strong>
             <a href="core-syntax-009.xht">core-syntax-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Syntactic White Space
           <ul class="assert">
@@ -160,7 +160,7 @@
       <tr id="list-style-020-4.1.1" class="primary">
         <td><strong>
             <a href="list-style-020.xht">list-style-020</a></strong></td>
-        <td></td>
+        <td><a href="reference/list-style-020-ref.xht">=</a> </td>
         <td></td>
         <td>'list-style' shorthand and 'none' values
           <ul class="assert">
@@ -179,7 +179,7 @@
       <tr id="whitespace-001-4.1.1" class="primary">
         <td><strong>
             <a href="whitespace-001.xht">whitespace-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
         <td></td>
         <td>White space - em-space (U+2003)
           <ul class="assert">
@@ -190,7 +190,7 @@
       <tr id="whitespace-002-4.1.1" class="primary">
         <td><strong>
             <a href="whitespace-002.xht">whitespace-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
         <td></td>
         <td>White space - ideographic space (U+3000)
           <ul class="assert">
@@ -213,7 +213,7 @@
       <tr id="keywords-000-4.1.2" class="primary">
         <td><strong>
             <a href="keywords-000.xht">keywords-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Keywords v. Strings (background)
         </td>
@@ -221,7 +221,7 @@
       <tr id="keywords-001-4.1.2" class="primary">
         <td><strong>
             <a href="keywords-001.xht">keywords-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/keywords-001-ref.xht">=</a> </td>
         <td></td>
         <td>Keywords v. Strings (width)
         </td>
@@ -269,7 +269,7 @@
       <tr id="case-sensitive-000-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-000.xht">case-sensitive-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of Properties and Keywords (background)
         </td>
@@ -277,7 +277,7 @@
       <tr id="case-sensitive-001-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-001.xht">case-sensitive-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of At-rules (@media)
         </td>
@@ -285,7 +285,7 @@
       <tr id="case-sensitive-003-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-003.xht">case-sensitive-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of pseudo-classes and pseudo-elements
           <ul class="assert">
@@ -296,7 +296,7 @@
       <tr id="case-sensitive-004-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-004.xht">case-sensitive-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of :lang() arguments
           <ul class="assert">
@@ -307,7 +307,7 @@
       <tr id="case-sensitive-005-4.1.3" class="primary">
         <td><strong>
             <a href="case-sensitive-005.xht">case-sensitive-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/case-sensitive-005-ref.xht">=</a> </td>
         <td></td>
         <td>Case-sensitivity of counter names
           <ul class="assert">
@@ -318,7 +318,7 @@
       <tr id="case-sensitive-007-4.1.3" class="primary nonHTML">
         <td><strong>
             <a href="case-sensitive-007.xht">case-sensitive-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
         <td></td>
         <td>Case sensitivity with element selectors
           <ul class="assert">
@@ -472,7 +472,7 @@
       <tr id="escapes-000-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-000.xht">escapes-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/escapes-000-ref.xht">=</a> </td>
         <td></td>
         <td>Escaped Newline in String
         </td>
@@ -480,7 +480,7 @@
       <tr id="escapes-001-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-001.xht">escapes-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Escaped Quote Marks in String
         </td>
@@ -488,7 +488,7 @@
       <tr id="escapes-002-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-002.xht">escapes-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Invalid Punctuation Escapes
         </td>
@@ -496,7 +496,7 @@
       <tr id="escapes-003-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-003.xht">escapes-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Class and Keyword Letter Escapes
         </td>
@@ -504,7 +504,7 @@
       <tr id="escapes-004-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-004.xht">escapes-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Unicode Escapes
         </td>
@@ -512,7 +512,7 @@
       <tr id="escapes-005-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-005.xht">escapes-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Unicode Escapes and Case Insensitivity
         </td>
@@ -520,7 +520,7 @@
       <tr id="escapes-006-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-006.xht">escapes-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Incorrect Letter Escape (Class Selector)
         </td>
@@ -528,7 +528,7 @@
       <tr id="escapes-007-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-007.xht">escapes-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Space-terminated Unicode Escapes
         </td>
@@ -536,7 +536,7 @@
       <tr id="escapes-008-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-008.xht">escapes-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Space-terminated Character Escapes
         </td>
@@ -544,7 +544,7 @@
       <tr id="escapes-009-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-009.xht">escapes-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Characters and case: Escaping a character inside a keyword
           <ul class="assert">
@@ -555,7 +555,7 @@
       <tr id="escapes-010-4.1.3" class="primary invalid">
         <td><strong>
             <a href="escapes-010.xht">escapes-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unicode-escaped Braces
           <ul class="assert">
@@ -566,7 +566,7 @@
       <tr id="escapes-012-4.1.3" class="primary">
         <td><strong>
             <a href="escapes-012.xht">escapes-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>CSS Parsing: Escaped keywords
         </td>
@@ -585,7 +585,7 @@
       <tr id="ident-000-4.1.3" class="primary">
         <td><strong>
             <a href="ident-000.xht">ident-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (a-z) as Classes and IDs
         </td>
@@ -593,7 +593,7 @@
       <tr id="ident-001-4.1.3" class="primary">
         <td><strong>
             <a href="ident-001.xht">ident-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs
         </td>
@@ -601,7 +601,7 @@
       <tr id="ident-002-4.1.3" class="primary">
         <td><strong>
             <a href="ident-002.xht">ident-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with _) as Classes and IDs
         </td>
@@ -609,7 +609,7 @@
       <tr id="ident-003-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-003.xht">ident-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Valid Identifiers (starting with -) as Classes and IDs
         </td>
@@ -617,7 +617,7 @@
       <tr id="ident-004-4.1.3" class="primary">
         <td><strong>
             <a href="ident-004.xht">ident-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with ideographic) as Classes and IDs
         </td>
@@ -625,7 +625,7 @@
       <tr id="ident-005-4.1.3" class="primary">
         <td><strong>
             <a href="ident-005.xht">ident-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including ideographic) as Classes and IDs
         </td>
@@ -633,7 +633,7 @@
       <tr id="ident-006-4.1.3" class="primary">
         <td><strong>
             <a href="ident-006.xht">ident-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escape) as Classes and IDs
         </td>
@@ -641,7 +641,7 @@
       <tr id="ident-007-4.1.3" class="primary">
         <td><strong>
             <a href="ident-007.xht">ident-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including escape) as Classes and IDs
         </td>
@@ -649,7 +649,7 @@
       <tr id="ident-008-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-008.xht">ident-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Identifiers (starting with digit) as Classes and IDs
         </td>
@@ -657,7 +657,7 @@
       <tr id="ident-009-4.1.3" class="primary">
         <td><strong>
             <a href="ident-009.xht">ident-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including digits) as Classes and IDs
         </td>
@@ -665,7 +665,7 @@
       <tr id="ident-010-4.1.3" class="primary">
         <td><strong>
             <a href="ident-010.xht">ident-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escape) as Classes and IDs
         </td>
@@ -673,7 +673,7 @@
       <tr id="ident-011-4.1.3" class="primary">
         <td><strong>
             <a href="ident-011.xht">ident-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (including escapes) as Classes and IDs
         </td>
@@ -681,7 +681,7 @@
       <tr id="ident-012-4.1.3" class="primary">
         <td><strong>
             <a href="ident-012.xht">ident-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-012-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs
         </td>
@@ -689,7 +689,7 @@
       <tr id="ident-013-4.1.3" class="primary">
         <td><strong>
             <a href="ident-013.xht">ident-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td></td>
         <td>Valid Identifiers (starting with escaped -) as Classes and IDs
         </td>
@@ -697,7 +697,7 @@
       <tr id="ident-020-4.1.3" class="primary invalid">
         <td><strong>
             <a href="ident-020.xht">ident-020</a></strong></td>
-        <td></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid Identifiers (starting with double -) as Classes and IDs
         </td>
@@ -735,7 +735,7 @@
       <tr id="at-import-009-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-009.xht">at-import-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following a known but invalid @rule
           <ul class="assert">
@@ -746,7 +746,7 @@
       <tr id="at-import-010-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-010.xht">at-import-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following an invalid selector
           <ul class="assert">
@@ -757,7 +757,7 @@
       <tr id="at-import-011-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-import-011.xht">at-import-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>@import following garbage
           <ul class="assert">
@@ -768,7 +768,7 @@
       <tr id="at-keywords-000-4.1.5" class="primary">
         <td><strong>
             <a href="at-keywords-000.xht">at-keywords-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -776,7 +776,7 @@
       <tr id="at-keywords-001-4.1.5" class="primary">
         <td><strong>
             <a href="at-keywords-001.xht">at-keywords-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -784,7 +784,7 @@
       <tr id="at-keywords-002-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-keywords-002.xht">at-keywords-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -792,7 +792,7 @@
       <tr id="at-rules-000-4.1.5" class="primary invalid">
         <td><strong>
             <a href="at-rules-000.xht">at-rules-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -800,7 +800,7 @@
       <tr id="at-rules-001-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-001.xht">at-rules-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -808,7 +808,7 @@
       <tr id="at-rules-002-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-002.xht">at-rules-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -816,7 +816,7 @@
       <tr id="at-rules-003-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-003.xht">at-rules-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -824,7 +824,7 @@
       <tr id="at-rules-004-4.1.5" class="primary">
         <td><strong>
             <a href="at-rules-004.xht">at-rules-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>At-rules
         </td>
@@ -832,7 +832,7 @@
       <tr id="import-000-4.1.5" class="primary invalid">
         <td><strong>
             <a href="import-000.xht">import-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -840,7 +840,7 @@
       <tr id="import-001-4.1.5" class="primary invalid">
         <td><strong>
             <a href="import-001.xht">import-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>At-rules
         </td>
@@ -863,7 +863,7 @@
       <tr id="blocks-001-4.1.6" class="primary invalid">
         <td><strong>
             <a href="blocks-001.xht">blocks-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/blocks-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Parsing nested blocks and strings in style blocks
           <ul class="assert">
@@ -963,7 +963,7 @@
       <tr id="escapes-011-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-011.xht">escapes-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>CSS Parsing: Escaped keywords
         </td>
@@ -971,7 +971,7 @@
       <tr id="escapes-013-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-013.xht">escapes-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/escapes-013-ref.xht">=</a> </td>
         <td></td>
         <td>Escaping and spaces with classes
         </td>
@@ -979,7 +979,7 @@
       <tr id="escapes-014-4.1.7" class="primary">
         <td><strong>
             <a href="escapes-014.xht">escapes-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Escaping and spaces with declarations
         </td>
@@ -1276,7 +1276,7 @@
       <tr id="sgml-comments-000-4.1.9" class="primary">
         <td><strong>
             <a href="sgml-comments-000.xht">sgml-comments-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>SGML comments
           <ul class="assert">
@@ -1298,7 +1298,7 @@
       <tr id="sgml-comments-002-4.1.9" class="primary">
         <td><strong>
             <a href="sgml-comments-002.xht">sgml-comments-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/sgml-comments-002-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of CDO/CDC in stylesheets
         </td>
@@ -1447,7 +1447,7 @@
       <tr id="at-rule-013-4.2" class="primary invalid">
         <td><strong>
             <a href="at-rule-013.xht">at-rule-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/at-rule-013-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside @media blocks
           <ul class="assert">
@@ -1517,7 +1517,7 @@
       <tr id="core-syntax-001-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-001.xht">core-syntax-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-001-ref.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places
         </td>
@@ -1525,7 +1525,7 @@
       <tr id="core-syntax-002-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-002.xht">core-syntax-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-002-ref.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places
         </td>
@@ -1533,7 +1533,7 @@
       <tr id="core-syntax-003-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-003.xht">core-syntax-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places (with no whitespace)
         </td>
@@ -1541,7 +1541,7 @@
       <tr id="core-syntax-004-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-004.xht">core-syntax-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Nested blocks in unexpected places (with no whitespace)
         </td>
@@ -1549,7 +1549,7 @@
       <tr id="core-syntax-006-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-006.xht">core-syntax-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-006-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1557,7 +1557,7 @@
       <tr id="core-syntax-007-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-007.xht">core-syntax-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/core-syntax-007-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1565,7 +1565,7 @@
       <tr id="core-syntax-008-4.2" class="primary">
         <td><strong>
             <a href="core-syntax-008.xht">core-syntax-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Parsing invalid '!' declarations
         </td>
@@ -1573,7 +1573,7 @@
       <tr id="counters-003-4.2" class="primary">
         <td><strong>
             <a href="counters-003.xht">counters-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter() function with no white space
           <ul class="assert">
@@ -1584,7 +1584,7 @@
       <tr id="counters-004-4.2" class="primary">
         <td><strong>
             <a href="counters-004.xht">counters-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with no white space and two function values
           <ul class="assert">
@@ -1595,7 +1595,7 @@
       <tr id="counters-005-4.2" class="primary">
         <td><strong>
             <a href="counters-005.xht">counters-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with no white space and three function values
           <ul class="assert">
@@ -1606,7 +1606,7 @@
       <tr id="counters-006-4.2" class="primary">
         <td><strong>
             <a href="counters-006.xht">counters-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter() function with white space
           <ul class="assert">
@@ -1617,7 +1617,7 @@
       <tr id="counters-007-4.2" class="primary">
         <td><strong>
             <a href="counters-007.xht">counters-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counter() function with white space and two function values
           <ul class="assert">
@@ -1628,7 +1628,7 @@
       <tr id="counters-008-4.2" class="primary">
         <td><strong>
             <a href="counters-008.xht">counters-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with white space and two function values
           <ul class="assert">
@@ -1639,7 +1639,7 @@
       <tr id="counters-009-4.2" class="primary">
         <td><strong>
             <a href="counters-009.xht">counters-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() function with white space and three function values
           <ul class="assert">
@@ -1650,7 +1650,7 @@
       <tr id="counters-010-4.2" class="primary">
         <td><strong>
             <a href="counters-010.xht">counters-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/counters-010-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing counters() functions
           <ul class="assert">
@@ -1672,7 +1672,7 @@
       <tr id="declaration-001-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-001.xht">declaration-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing ':', value, part 1
         </td>
@@ -1680,7 +1680,7 @@
       <tr id="declaration-002-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-002.xht">declaration-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing ':', value, part 2
         </td>
@@ -1688,7 +1688,7 @@
       <tr id="declaration-003-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-003.xht">declaration-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing value, part 1
         </td>
@@ -1696,7 +1696,7 @@
       <tr id="declaration-004-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-004.xht">declaration-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration missing value, part 2
         </td>
@@ -1704,7 +1704,7 @@
       <tr id="declaration-005-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-005.xht">declaration-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration: unexpected tokens { }, part 1
         </td>
@@ -1712,7 +1712,7 @@
       <tr id="declaration-006-4.2" class="primary invalid">
         <td><strong>
             <a href="declaration-006.xht">declaration-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>malformed declaration: unexpected tokens { }, part 2
         </td>
@@ -1720,7 +1720,7 @@
       <tr id="declarations-009-4.2" class="primary invalid">
         <td><strong>
             <a href="declarations-009.xht">declarations-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/declarations-009-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside declaration blocks
           <ul class="assert">
@@ -1830,7 +1830,7 @@
       <tr id="font-family-invalid-characters-003-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid curly brackets and pair matching
           <ul class="assert">
@@ -1841,7 +1841,7 @@
       <tr id="font-family-invalid-characters-004-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid square brackets and pair matching
           <ul class="assert">
@@ -1852,7 +1852,7 @@
       <tr id="font-family-invalid-characters-005-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid quotes and pair matching
           <ul class="assert">
@@ -1863,7 +1863,7 @@
       <tr id="font-family-invalid-characters-006-4.2" class="ahem invalid">
         <td>
             <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
-        <td></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Invalid single quotes and pair matching
           <ul class="assert">
@@ -1995,7 +1995,7 @@
       <tr id="matching-brackets-001-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-001.xht">matching-brackets-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for @rules
           <ul class="assert">
@@ -2006,7 +2006,7 @@
       <tr id="matching-brackets-002-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-002.xht">matching-brackets-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-002-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for declarations
           <ul class="assert">
@@ -2017,7 +2017,7 @@
       <tr id="matching-brackets-003-4.2" class="primary invalid">
         <td><strong>
             <a href="matching-brackets-003.xht">matching-brackets-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for selectors
           <ul class="assert">
@@ -2036,7 +2036,7 @@
       <tr id="selectors-parsing-001-4.2" class="primary">
         <td><strong>
             <a href="selectors-parsing-001.xht">selectors-parsing-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/selectors-parsing-001-ref.xht">=</a> </td>
         <td></td>
         <td>CSS: Selector Parsing and Invalid Pseudo-Elements
         </td>
@@ -2044,7 +2044,7 @@
       <tr id="unterminated-string-001-4.2" class="primary invalid">
         <td><strong>
             <a href="unterminated-string-001.xht">unterminated-string-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Error handling of unterminated strings
           <ul class="assert">
@@ -2063,7 +2063,7 @@
       <tr id="uri-017-4.2" class="primary image invalid">
         <td><strong>
             <a href="uri-017.xht">uri-017</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-017-ref.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unclosed URI Token at EOF (in declaration)
           <ul class="assert">
@@ -2074,7 +2074,7 @@
       <tr id="uri-018-4.2" class="primary image invalid">
         <td><strong>
             <a href="uri-018.xht">uri-018</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unclosed URI Token at EOF (in @import)
           <ul class="assert">
@@ -2150,7 +2150,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s4.3.1">+</a>
         <a href="http://www.w3.org/TR/CSS21/syndata.html#numbers">4.3.1 Integers and real numbers</a></th></tr>
-      <!-- 10 tests -->
+      <!-- 9 tests -->
       <tr id="numbers-units-001-4.3.1" class="primary invalid">
         <td><strong>
             <a href="numbers-units-001.xht">numbers-units-001</a></strong></td>
@@ -2187,7 +2187,7 @@
       <tr id="numbers-units-004-4.3.1" class="primary">
         <td><strong>
             <a href="numbers-units-004.xht">numbers-units-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
         <td></td>
         <td>Parsing integer numbers with '+'
           <ul class="assert">
@@ -2195,17 +2195,6 @@
           </ul>
         </td>
       </tr>
-      <tr id="positive-integer-001-4.3.1" class="primary">
-        <td><strong>
-            <a href="positive-integer-001.xht">positive-integer-001</a></strong></td>
-        <td></td>
-        <td></td>
-        <td>Parsing signed integers
-          <ul class="assert">
-            <li>Positively signed integers are treated the same as non-signed integers.</li>
-          </ul>
-        </td>
-      </tr>
       <tr id="z-index-015-4.3.1" class="invalid">
         <td>
             <a href="z-index-015.xht">z-index-015</a></td>
@@ -2314,7 +2303,7 @@
       <tr id="c547-indent-000-4.3.2" class="ahem">
         <td>
             <a href="c547-indent-000.xht">c547-indent-000</a></td>
-        <td></td>
+        <td><a href="reference/c547-indent-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>text-indent
         </td>
@@ -2338,7 +2327,7 @@
       <tr id="c5510-padn-000-4.3.2" class="ahem image">
         <td>
             <a href="c5510-padn-000.xht">c5510-padn-000</a></td>
-        <td></td>
+        <td><a href="reference/c5510-padn-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>padding
         </td>
@@ -2406,7 +2395,7 @@
       <tr id="numbers-units-006-4.3.2" class="primary invalid">
         <td><strong>
             <a href="numbers-units-006.xht">numbers-units-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Unsupported negative values
           <ul class="assert">
@@ -2417,7 +2406,7 @@
       <tr id="numbers-units-007-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-007.xht">numbers-units-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-007-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em sizes
           <ul class="assert">
@@ -2428,7 +2417,7 @@
       <tr id="numbers-units-009-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-009.xht">numbers-units-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-009-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with the font-size set to px size
           <ul class="assert">
@@ -2439,7 +2428,7 @@
       <tr id="numbers-units-010-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-010.xht">numbers-units-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-010-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to inch
           <ul class="assert">
@@ -2450,7 +2439,7 @@
       <tr id="numbers-units-011-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-011.xht">numbers-units-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-011-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to em
           <ul class="assert">
@@ -2461,7 +2450,7 @@
       <tr id="numbers-units-012-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-012.xht">numbers-units-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-012-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to ex
           <ul class="assert">
@@ -2472,7 +2461,7 @@
       <tr id="numbers-units-013-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-013.xht">numbers-units-013</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-013-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Em size with font-size set to percentage
           <ul class="assert">
@@ -2483,7 +2472,7 @@
       <tr id="numbers-units-015-4.3.2" class="primary ahem should">
         <td><strong>
             <a href="numbers-units-015.xht">numbers-units-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-014-ref-a.xht">=</a> <a href="reference/numbers-units-014-ref-b.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="should" title="Behavior tested is recommended but not required">Recommend</abbr></td>
         <td>Height of EX
           <ul class="assert">
@@ -2494,7 +2483,7 @@
       <tr id="numbers-units-018-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-018.xht">numbers-units-018</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-018-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Specifying em/ex on the root element
           <ul class="assert">
@@ -2505,7 +2494,7 @@
       <tr id="numbers-units-019-4.3.2" class="primary ahem">
         <td><strong>
             <a href="numbers-units-019.xht">numbers-units-019</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-019-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>First available font defines the 'ex' unit size
           <ul class="assert">
@@ -2516,7 +2505,7 @@
       <tr id="numbers-units-021-4.3.2" class="primary 96dpi ahem">
         <td><strong>
             <a href="numbers-units-021.xht">numbers-units-021</a></strong></td>
-        <td></td>
+        <td><a href="reference/numbers-units-021-ref.xht">=</a> </td>
         <td><abbr class="96dpi" title="Only valid on 96dpi displays">96</abbr><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
         <td>Root element and the 'em' unit size
           <ul class="assert">
@@ -2589,7 +2578,7 @@
       <tr id="units-005-4.3.2" class="primary">
         <td><strong>
             <a href="units-005.xht">units-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/units-005-ref.xht">=</a> </td>
         <td></td>
         <td>Units: em (0.87em floats)
         </td>
@@ -2745,7 +2734,7 @@
       <tr id="uri-004-4.3.4" class="primary image">
         <td><strong>
             <a href="uri-004.xht">uri-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>URL function with URI that has escaped special chars
           <ul class="assert">
@@ -2756,7 +2745,7 @@
       <tr id="uri-005-4.3.4" class="primary image">
         <td><strong>
             <a href="uri-005.xht">uri-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>URL function with escaped special chars - single quote
           <ul class="assert">
@@ -2833,7 +2822,7 @@
       <tr id="uri-012-4.3.4" class="primary invalid">
         <td><strong>
             <a href="uri-012.xht">uri-012</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-012-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Error handling of broken url() - balancing braces
         </td>
@@ -2841,7 +2830,7 @@
       <tr id="uri-014-4.3.4" class="primary">
         <td><strong>
             <a href="uri-014.xht">uri-014</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Unquoted commas in url()
           <ul class="assert">
@@ -2852,7 +2841,7 @@
       <tr id="uri-015-4.3.4" class="primary">
         <td><strong>
             <a href="uri-015.xht">uri-015</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td></td>
         <td>Escaped url() functional notation
           <ul class="assert">
@@ -2863,7 +2852,7 @@
       <tr id="uri-016-4.3.4" class="primary">
         <td><strong>
             <a href="uri-016.xht">uri-016</a></strong></td>
-        <td></td>
+        <td><a href="reference/uri-016-ref.xht">=</a> </td>
         <td></td>
         <td>Error handling of broken url() with open /*
           <ul class="assert">
@@ -2883,7 +2872,7 @@
       <tr id="content-counter-000-4.3.5" class="">
         <td>
             <a href="content-counter-000.xht">content-counter-000</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c)
         </td>
@@ -2891,7 +2880,7 @@
       <tr id="content-counter-001-4.3.5" class="">
         <td>
             <a href="content-counter-001.xht">content-counter-001</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, none)
         </td>
@@ -2899,7 +2888,7 @@
       <tr id="content-counter-002-4.3.5" class="">
         <td>
             <a href="content-counter-002.xht">content-counter-002</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, disc)
         </td>
@@ -2907,7 +2896,7 @@
       <tr id="content-counter-003-4.3.5" class="">
         <td>
             <a href="content-counter-003.xht">content-counter-003</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, circle)
         </td>
@@ -2915,7 +2904,7 @@
       <tr id="content-counter-004-4.3.5" class="">
         <td>
             <a href="content-counter-004.xht">content-counter-004</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, square)
         </td>
@@ -2923,7 +2912,7 @@
       <tr id="content-counter-005-4.3.5" class="">
         <td>
             <a href="content-counter-005.xht">content-counter-005</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal)
         </td>
@@ -2931,7 +2920,7 @@
       <tr id="content-counter-006-4.3.5" class="">
         <td>
             <a href="content-counter-006.xht">content-counter-006</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, decimal-leading-zero)
         </td>
@@ -2939,7 +2928,7 @@
       <tr id="content-counter-007-4.3.5" class="">
         <td>
             <a href="content-counter-007.xht">content-counter-007</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-roman)
         </td>
@@ -2947,7 +2936,7 @@
       <tr id="content-counter-008-4.3.5" class="">
         <td>
             <a href="content-counter-008.xht">content-counter-008</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-roman)
         </td>
@@ -2955,7 +2944,7 @@
       <tr id="content-counter-009-4.3.5" class="">
         <td>
             <a href="content-counter-009.xht">content-counter-009</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, georgian)
         </td>
@@ -2963,7 +2952,7 @@
       <tr id="content-counter-010-4.3.5" class="">
         <td>
             <a href="content-counter-010.xht">content-counter-010</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, armenian)
         </td>
@@ -2971,7 +2960,7 @@
       <tr id="content-counter-011-4.3.5" class="">
         <td>
             <a href="content-counter-011.xht">content-counter-011</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-latin)
         </td>
@@ -2979,7 +2968,7 @@
       <tr id="content-counter-012-4.3.5" class="">
         <td>
             <a href="content-counter-012.xht">content-counter-012</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-alpha)
         </td>
@@ -2987,7 +2976,7 @@
       <tr id="content-counter-013-4.3.5" class="">
         <td>
             <a href="content-counter-013.xht">content-counter-013</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-latin)
         </td>
@@ -2995,7 +2984,7 @@
       <tr id="content-counter-014-4.3.5" class="">
         <td>
             <a href="content-counter-014.xht">content-counter-014</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, upper-alpha)
         </td>
@@ -3003,7 +2992,7 @@
       <tr id="content-counter-015-4.3.5" class="">
         <td>
             <a href="content-counter-015.xht">content-counter-015</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
         <td></td>
         <td>content: counter(c, lower-greek)
         </td>
@@ -3011,7 +3000,7 @@
       <tr id="content-counter-016-4.3.5" class="invalid">
         <td>
             <a href="content-counter-016.xht">content-counter-016</a></td>
-        <td></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>content: counter() error cases
         </td>
@@ -3367,7 +3356,7 @@
       <tr id="color-000-4.3.6" class="primary invalid">
         <td><strong>
             <a href="color-000.xht">color-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/color-000-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>RGB color syntax error handling
         </td>
@@ -3430,7 +3419,7 @@
       <tr id="colors-006-4.3.6" class="primary">
         <td><strong>
             <a href="colors-006.xht">colors-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/colors-006-ref.xht">=</a> </td>
         <td></td>
         <td>Comparing color keywords and hex values
           <ul class="assert">
@@ -3461,7 +3450,7 @@
       <tr id="escaped-newline-001-4.3.7" class="primary">
         <td><strong>
             <a href="escaped-newline-001.xht">escaped-newline-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/escaped-newline-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing strings with escaped newlines
           <ul class="assert">
@@ -3472,7 +3461,7 @@
       <tr id="quoted-string-001-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-001.xht">quoted-string-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of single quotes inside double quotes
           <ul class="assert">
@@ -3483,7 +3472,7 @@
       <tr id="quoted-string-002-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-002.xht">quoted-string-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of double quotes inside single quotes
           <ul class="assert">
@@ -3494,7 +3483,7 @@
       <tr id="quoted-string-003-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-003.xht">quoted-string-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of escaped quotes (single within single)
           <ul class="assert">
@@ -3505,7 +3494,7 @@
       <tr id="quoted-string-004-4.3.7" class="primary">
         <td><strong>
             <a href="quoted-string-004.xht">quoted-string-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
         <td></td>
         <td>Parsing of escaped double quotes
           <ul class="assert">
@@ -3516,7 +3505,7 @@
       <tr id="strings-000-4.3.7" class="primary">
         <td><strong>
             <a href="strings-000.xht">strings-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Newlines in strings
         </td>
@@ -3542,7 +3531,7 @@
       <tr id="at-charset-001-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-001.xht">at-charset-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP Charset vs BOM
           <ul class="assert">
@@ -3553,7 +3542,7 @@
       <tr id="at-charset-002-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-002.xht">at-charset-002</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP Charset over @charset
           <ul class="assert">
@@ -3564,7 +3553,7 @@
       <tr id="at-charset-003-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-003.xht">at-charset-003</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over link charset
           <ul class="assert">
@@ -3575,7 +3564,7 @@
       <tr id="at-charset-004-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-004.xht">at-charset-004</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over set referring code page (UTF-8)
           <ul class="assert">
@@ -3586,7 +3575,7 @@
       <tr id="at-charset-005-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-005.xht">at-charset-005</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over set referring code page (windows-1252)
           <ul class="assert">
@@ -3597,7 +3586,7 @@
       <tr id="at-charset-006-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-006.xht">at-charset-006</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>HTTP charset over referring code page (not set)
           <ul class="assert">
@@ -3608,7 +3597,7 @@
       <tr id="at-charset-007-4.4" class="primary">
         <td><strong>
             <a href="at-charset-007.xht">at-charset-007</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset over link charset attribute
           <ul class="assert">
@@ -3619,7 +3608,7 @@
       <tr id="at-charset-008-4.4" class="primary">
         <td><strong>
             <a href="at-charset-008.xht">at-charset-008</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset over referring document's code page (set)
           <ul class="assert">
@@ -3630,7 +3619,7 @@
       <tr id="at-charset-009-4.4" class="primary">
         <td><strong>
             <a href="at-charset-009.xht">at-charset-009</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset over referring document's code page (unset)
           <ul class="assert">
@@ -3641,7 +3630,7 @@
       <tr id="at-charset-010-4.4" class="primary">
         <td><strong>
             <a href="at-charset-010.xht">at-charset-010</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Link charset attribute over referring document's codepage (set)
           <ul class="assert">
@@ -3652,7 +3641,7 @@
       <tr id="at-charset-011-4.4" class="primary">
         <td><strong>
             <a href="at-charset-011.xht">at-charset-011</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Link charset attribute over referring document's codepage (not set)
           <ul class="assert">
@@ -3663,7 +3652,7 @@
       <tr id="at-charset-012-4.4" class="primary">
         <td><strong>
             <a href="at-charset-012.xht">at-charset-012</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Stylesheet encoding via the referring document's encoding (set)
           <ul class="assert">
@@ -3674,7 +3663,7 @@
       <tr id="at-charset-014-4.4" class="primary">
         <td><strong>
             <a href="at-charset-014.xht">at-charset-014</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-8)
           <ul class="assert">
@@ -3685,7 +3674,7 @@
       <tr id="at-charset-015-4.4" class="primary">
         <td><strong>
             <a href="at-charset-015.xht">at-charset-015</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-16 LE)
           <ul class="assert">
@@ -3696,7 +3685,7 @@
       <tr id="at-charset-016-4.4" class="primary">
         <td><strong>
             <a href="at-charset-016.xht">at-charset-016</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Matching BOM and @charset (utf-16 BE)
           <ul class="assert">
@@ -3707,7 +3696,7 @@
       <tr id="at-charset-019-4.4" class="primary">
         <td><strong>
             <a href="at-charset-019.xht">at-charset-019</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-8)
           <ul class="assert">
@@ -3718,7 +3707,7 @@
       <tr id="at-charset-020-4.4" class="primary">
         <td><strong>
             <a href="at-charset-020.xht">at-charset-020</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-16LE)
           <ul class="assert">
@@ -3729,7 +3718,7 @@
       <tr id="at-charset-021-4.4" class="primary">
         <td><strong>
             <a href="at-charset-021.xht">at-charset-021</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>BOM with no @charset (utf-16BE)
           <ul class="assert">
@@ -3740,7 +3729,7 @@
       <tr id="at-charset-024-4.4" class="primary">
         <td><strong>
             <a href="at-charset-024.xht">at-charset-024</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (windows-1252)
           <ul class="assert">
@@ -3751,7 +3740,7 @@
       <tr id="at-charset-025-4.4" class="primary">
         <td><strong>
             <a href="at-charset-025.xht">at-charset-025</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (Shift-JIS)
           <ul class="assert">
@@ -3762,7 +3751,7 @@
       <tr id="at-charset-026-4.4" class="primary">
         <td><strong>
             <a href="at-charset-026.xht">at-charset-026</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (ISO-8859-6)
           <ul class="assert">
@@ -3773,7 +3762,7 @@
       <tr id="at-charset-027-4.4" class="primary">
         <td><strong>
             <a href="at-charset-027.xht">at-charset-027</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (Big5)
           <ul class="assert">
@@ -3784,7 +3773,7 @@
       <tr id="at-charset-028-4.4" class="primary">
         <td><strong>
             <a href="at-charset-028.xht">at-charset-028</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-8)
           <ul class="assert">
@@ -3795,7 +3784,7 @@
       <tr id="at-charset-029-4.4" class="primary">
         <td><strong>
             <a href="at-charset-029.xht">at-charset-029</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-16LE)
           <ul class="assert">
@@ -3806,7 +3795,7 @@
       <tr id="at-charset-030-4.4" class="primary">
         <td><strong>
             <a href="at-charset-030.xht">at-charset-030</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset specified (UTF-16BE)
           <ul class="assert">
@@ -3894,7 +3883,7 @@
       <tr id="at-charset-040-4.4" class="primary">
         <td><strong>
             <a href="at-charset-040.xht">at-charset-040</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Non-matching @charset (UTF-16BE with UTF-8 @charset)
           <ul class="assert">
@@ -3905,7 +3894,7 @@
       <tr id="at-charset-041-4.4" class="primary">
         <td><strong>
             <a href="at-charset-041.xht">at-charset-041</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Non-matching @charset (UTF-32LE with UTF-16BE @charset)
           <ul class="assert">
@@ -3916,7 +3905,7 @@
       <tr id="at-charset-042-4.4" class="primary">
         <td><strong>
             <a href="at-charset-042.xht">at-charset-042</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3927,7 +3916,7 @@
       <tr id="at-charset-043-4.4" class="primary">
         <td><strong>
             <a href="at-charset-043.xht">at-charset-043</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)
           <ul class="assert">
@@ -3938,7 +3927,7 @@
       <tr id="at-charset-044-4.4" class="primary">
         <td><strong>
             <a href="at-charset-044.xht">at-charset-044</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3949,7 +3938,7 @@
       <tr id="at-charset-045-4.4" class="primary">
         <td><strong>
             <a href="at-charset-045.xht">at-charset-045</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)
           <ul class="assert">
@@ -3960,7 +3949,7 @@
       <tr id="at-charset-046-4.4" class="primary">
         <td><strong>
             <a href="at-charset-046.xht">at-charset-046</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)
           <ul class="assert">
@@ -3971,7 +3960,7 @@
       <tr id="at-charset-047-4.4" class="primary">
         <td><strong>
             <a href="at-charset-047.xht">at-charset-047</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Endianness not specified (UTF-16LE encoding with UTF-16 @charset)
           <ul class="assert">
@@ -3982,7 +3971,7 @@
       <tr id="at-charset-048-4.4" class="primary">
         <td><strong>
             <a href="at-charset-048.xht">at-charset-048</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>Endianness not specified (UTF-16BE encoding with UTF-16 @charset)
           <ul class="assert">
@@ -4048,7 +4037,7 @@
       <tr id="at-charset-054-4.4" class="primary">
         <td><strong>
             <a href="at-charset-054.xht">at-charset-054</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td></td>
         <td>@charset in uppercase
           <ul class="assert">
@@ -4070,7 +4059,7 @@
       <tr id="at-charset-056-4.4" class="primary">
         <td><strong>
             <a href="at-charset-056.xht">at-charset-056</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td></td>
         <td>@charset missing a space
           <ul class="assert">
@@ -4114,7 +4103,7 @@
       <tr id="at-charset-060-4.4" class="primary">
         <td><strong>
             <a href="at-charset-060.xht">at-charset-060</a></strong></td>
-        <td></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
         <td></td>
         <td>@charset with bogus name
           <ul class="assert">
@@ -4125,7 +4114,7 @@
       <tr id="at-charset-061-4.4" class="primary">
         <td><strong>
             <a href="at-charset-061.xht">at-charset-061</a></strong></td>
-        <td></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
         <td></td>
         <td>@charset within style block
           <ul class="assert">
@@ -4136,7 +4125,7 @@
       <tr id="at-charset-071-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-071.xht">at-charset-071</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-1
         </td>
@@ -4144,7 +4133,7 @@
       <tr id="at-charset-072-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-072.xht">at-charset-072</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-11
         </td>
@@ -4152,7 +4141,7 @@
       <tr id="at-charset-073-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-073.xht">at-charset-073</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-5
         </td>
@@ -4160,7 +4149,7 @@
       <tr id="at-charset-074-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-074.xht">at-charset-074</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-6
         </td>
@@ -4168,7 +4157,7 @@
       <tr id="at-charset-075-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-075.xht">at-charset-075</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-7
         </td>
@@ -4176,7 +4165,7 @@
       <tr id="at-charset-076-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-076.xht">at-charset-076</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: ISO-8859-8
         </td>
@@ -4184,7 +4173,7 @@
       <tr id="at-charset-077-4.4" class="primary http">
         <td><strong>
             <a href="at-charset-077.xht">at-charset-077</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
         <td><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
         <td>Stylesheet encodings: KOI8-R
         </td>
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 08c227e29e2..0461a17a3bf 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
@@ -35,7 +35,7 @@
       <tr id="cascade-import-dynamic-001-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-001.xht">cascade-import-dynamic-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet append (&lt;style&gt;)
         </td>
@@ -43,7 +43,7 @@
       <tr id="cascade-import-dynamic-002-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-002.xht">cascade-import-dynamic-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet append (&lt;link&gt;)
         </td>
@@ -51,7 +51,7 @@
       <tr id="cascade-import-dynamic-003-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-003.xht">cascade-import-dynamic-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet insertion (&lt;style&gt;)
         </td>
@@ -59,7 +59,7 @@
       <tr id="cascade-import-dynamic-004-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-004.xht">cascade-import-dynamic-004</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet insertion (&lt;link&gt;)
         </td>
@@ -67,7 +67,7 @@
       <tr id="cascade-import-dynamic-005-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-005.xht">cascade-import-dynamic-005</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet deletion (&lt;style&gt;)
         </td>
@@ -75,7 +75,7 @@
       <tr id="cascade-import-dynamic-006-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-006.xht">cascade-import-dynamic-006</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Dynamic sheet deletion (&lt;link&gt;)
         </td>
@@ -83,7 +83,7 @@
       <tr id="cascade-import-dynamic-control-5" class="primary">
         <td><strong>
             <a href="cascade-import-dynamic-control.xht">cascade-import-dynamic-control</a></strong></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Control test
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-7.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-7.xht
index 17abc885233..d7bd96b3edd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-7.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-7.xht
@@ -246,7 +246,7 @@
       <tr id="at-rule-013-7.2.1" class="invalid">
         <td>
             <a href="at-rule-013.xht">at-rule-013</a></td>
-        <td></td>
+        <td><a href="reference/at-rule-013-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Ignoring at-rules inside @media blocks
           <ul class="assert">
@@ -257,7 +257,7 @@
       <tr id="matching-brackets-001-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-001.xht">matching-brackets-001</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for @rules
           <ul class="assert">
@@ -268,7 +268,7 @@
       <tr id="matching-brackets-002-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-002.xht">matching-brackets-002</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-002-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for declarations
           <ul class="assert">
@@ -279,7 +279,7 @@
       <tr id="matching-brackets-003-7.2.1" class="invalid">
         <td>
             <a href="matching-brackets-003.xht">matching-brackets-003</a></td>
-        <td></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
         <td><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
         <td>Matching brackets and quotes for selectors
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-8.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-8.xht
index 280c5ee0b5e..2bd4253618a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-8.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-8.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Box model (2326 tests)</h2>
+  <h2>Box model (2327 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -8352,7 +8352,7 @@
       <tr id="c5510-padn-000-8.4" class="ahem image">
         <td>
             <a href="c5510-padn-000.xht">c5510-padn-000</a></td>
-        <td></td>
+        <td><a href="reference/c5510-padn-000-ref.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
         <td>padding
         </td>
@@ -45557,7 +45557,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s8.6">+</a>
         <a href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model">8.6 The box model for inline elements in bidirectional context</a></th></tr>
-      <!-- 80 tests -->
+      <!-- 81 tests -->
       <tr id="bidi-001-8.6" class="">
         <td>
             <a href="bidi-001.xht">bidi-001</a></td>
@@ -45591,6 +45591,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-8.6" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-8.6" class="">
         <td>
             <a href="bidi-005.xht">bidi-005</a></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 56d64f8ca1b..e8e18e40880 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 (1245 tests)</h2>
+  <h2>Visual formatting model (1246 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -17418,7 +17418,7 @@
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s9.10">+</a>
         <a href="http://www.w3.org/TR/CSS21/visuren.html#direction">9.10 Text direction: the 'direction' and 'unicode-bidi' properties</a></th></tr>
-      <!-- 118 tests -->
+      <!-- 119 tests -->
       <tr id="bidi-001-9.10" class="">
         <td>
             <a href="bidi-001.xht">bidi-001</a></td>
@@ -17452,6 +17452,14 @@
           </ul>
         </td>
       </tr>
+      <tr id="bidi-004-9.10" class="ahem may21">
+        <td>
+            <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+        <td>The bidi algorithm and inlines in CSS
+        </td>
+      </tr>
       <tr id="bidi-005-9.10" class="">
         <td>
             <a href="bidi-005.xht">bidi-005</a></td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/color-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/color-000.xht
index e5b50d4b3b1..0c6fd9cebfc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/color-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/color-000.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#color-units"/>
+  <link rel="match" href="reference/color-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p.correct { color: red }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/colors-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/colors-006.xht
index 2e3440e40b9..d214461d25b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/colors-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/colors-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/syndata.html#color-units" />
+        <link rel="match" href="reference/colors-006-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Color matching of keywords and hex values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-000.xht
index 059ed84d1dd..b3d3af34b16 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-000.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-000-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-001.xht
index 7925f6cfe37..7fe4aebee36 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-001.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-001-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-002.xht
index 36a72de3482..9393ff5b2b8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-002.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-002-ref.xht"/>
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-003.xht
index 4498d735e55..47eb2ed3b87 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-003.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-003-ref.xht"/>
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-004.xht
index 91e5e569021..9a5e4adcedd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-004.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-004-ref.xht"/>
   <style type="text/css">
 
   div { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-005.xht
index 03b9e511096..7231e82c1f5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-005.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-000-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-006.xht
index 41d76eb0f9f..8eedbbcc097 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-006.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-006-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-007.xht
index 9e20cdc8fd2..e2b356aeaab 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-007.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-007-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-008.xht
index 5f3b71c32ff..ba998dea63c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-008.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-008-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-009.xht
index d00865d2a1b..4d88d126419 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-009.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-009-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-010.xht
index 8e313d0ee2d..12ade766bc2 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-010.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-010-ref.xht"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-011.xht
index 45ef05023c9..67d90ad8b77 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-011.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-011-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-012.xht
index 119743de17a..a93822bfe2b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-012.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-011-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-013.xht
index 6e707bb5a2e..f6a842aa68d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-013.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-013-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-014.xht
index 3dfa58d5ef6..0fa3c8d1d75 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-014.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-013-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-015.xht
index 6cba670bd05..9bddb9b4951 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-015.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-015-ref.xht"/>
   <style type="text/css">
 
   body { white-space: nowrap; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-016.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-016.xht
index 81303882470..734a46ac02b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-016.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counter-016.xht
@@ -15,6 +15,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counter-styles"/>
+  <link rel="match" href="reference/content-counter-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
@@ -29,7 +30,6 @@
     content: counter(f, ".", decimal);
     content: counter(f, decimal, ".");
     content: counter(f, decimal, decimal);
-    content: counter(f, unknowntype);
   }
 
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counters-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counters-018.xht
index 29fdf58038b..44cccbc2f8c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/content-counters-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/content-counters-018.xht
@@ -30,7 +30,6 @@
     content: counters(f, decimal, ".");
     content: counters(f, ".", decimal, decimal);
     content: counters(f, ".", decimal, ".");
-    content: counters(f, ".", unknowntype);
   }
 
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-001.xht
index df5d0cb3f64..c49e061eb68 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-001.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-001-ref.xht" />
   <style type="text/css">
    .test { color: green; }
    .test { test { :nested; color: yellow; background: red; }: not-nested; text-decoration: underline; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-002.xht
index 292351ab68f..64133be368d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-002.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-002-ref.xht" />
   <style type="text/css">
    .instruct { color: black; background: white; }
    p {
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-003.xht
index 47ad24bbc0f..7a16f5fa230 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-003.xht
@@ -14,9 +14,10 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/003.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">p{color:green;/*no"}"*/span{color:yellow;background:red;}.test{color:maroon;background:yellow;}}</style>
  </head>
  <body>
-  <p>This line <span>should</span> be <span class="test">all green</span>.</p>
+  <p>This text <span>should</span> be <span class="test">green</span>.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-004.xht
index d9f5fc54156..d359ae938d5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-004.xht
@@ -14,12 +14,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002-demo.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">
  body { color : green ; p{color : red ; }
  span { color : red ; }
   </style>
  </head>
  <body>
-  <p>This <span>sentence</span> should be <span>green</span>.</p>
+  <p>This <span>text</span> should be <span>green</span>.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-006.xht
index 694783dad3c..724207536ac 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-006.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/006.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-006-ref.xht" />
   <style type="text/css">
    body { color: green; }
    p { background: red ! fail; color: yellow ! fail }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-007.xht
index 383c3f96710..565d5c6525f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-007.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/007.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/core-syntax-007-ref.xht" />
   <style type="text/css">
    body { font-size: 200px; }
    p { font-size: 16px; font-size: 200!invalid; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-008.xht
index f03689e4fe6..bb57d563064 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-008.xht
@@ -14,12 +14,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/008.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">
    body { color: green; }
    p { color: 1111ff; }
   </style>
  </head>
  <body>
-  <p>This line should be green.</p>
+  <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-009.xht
index 75a1ea8e786..f81952244b4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/core-syntax-009.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="assert" content="Only the characters U+0020, U+0009, U+000A,     U+000D, and U+000C are considered white space."/>
   <style type="text/css">
     @import "support/core-syntax-009.css";
@@ -29,7 +30,7 @@
  </head>
  <body>
   <div>
-   <p>This sentence must be green.</p>
+   <p>This text should be green.</p>
   </div>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-001.xht
index 0ebb2575ecd..87edac7670c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-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/syndata.html" />
+        <link rel="match" href="reference/counters-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Counters can be referred to using only the identifier." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-003.xht
index 5cd3d754f31..91d94ac8144 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counter function can be parsed with no white space separating the function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-004.xht
index 55cb71eb33b..0eba8b007c8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with no white space separating the two function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-005.xht
index ae87819daf1..44970744b3b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-005.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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with no white space separating the three function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-006.xht
index 9339b769bab..99ff27291ef 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counter function can be parsed with white space separating the function value." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-007.xht
index 30f759a755e..1962d6c2583 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-007.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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counter function can be parsed with white space separating the two function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-008.xht
index 8b12043ebb3..ab5f70cfde6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-008.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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-004-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with white space separating the two function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-009.xht
index 2a23da72db6..9e3eb72bfd7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-009.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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-003-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The counters function can be parsed with white space separating the three function values." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-010.xht
index 56a435096c9..e553a8fdc2d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/counters-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/counters-010.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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/counters-010-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="To refer to a sequence of nested counters of the same name, the notation is 'counters(identifier, string)' or 'counters(identifier, string, list-style-type)'." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-001.xht
index 34a2bd10ab1..6c812dc815f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-001.xht
@@ -13,12 +13,13 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:green; color }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-002.xht
index 0a431f94959..95e8353eb50 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-002.xht
@@ -13,12 +13,13 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:red;   color; color:green }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-003.xht
index 05f2e7557c6..fe7ad1cd700 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-003.xht
@@ -13,12 +13,13 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:green; color: }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-004.xht
index c6b14aa18c8..3560b422100 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-004.xht
@@ -13,12 +13,13 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:red; color:; color:green }
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-005.xht
index cbb62c9cbc8..d1cbbd8995a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-005.xht
@@ -13,12 +13,13 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:green; color{;color:maroon} } 
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-006.xht
index fe8b4f2fbac..edec52fccc8 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declaration-006.xht
@@ -13,12 +13,13 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
     p { color:red; color{;color:maroon}; color:green } 
   </style>
  </head>
  <body>
-   <p>This text should be green</p>
+   <p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/declarations-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/declarations-009.xht
index c1dcc5f4c4b..0bb44c9ddb0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/declarations-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/declarations-009.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/declarations-009-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="At-rules inside declaration blocks are parsed as malformed declarations."/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escaped-newline-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escaped-newline-001.xht
index ced0a056550..e5fa6e695b4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escaped-newline-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escaped-newline-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/syndata.html#strings" />
+        <link rel="match" href="reference/escaped-newline-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Strings with escaped newlines are treated as a single whole string." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-000.xht
index c6bbc12c68b..e822e773dbf 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/escapes-000-ref.xht"/>
   <style type="text/css">
 
   p.one:before { content: "This "; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-001.xht
index d25306aac25..54c0817b9a1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-002.xht
index c22c474210c..0f87c45efee 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-002.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class#id { background: green; color: white; }
@@ -32,7 +33,7 @@
  </head>
  <body>
 
- <p class="class" id="id">This paragraph should have a green background.</p>
+ <p class="class" id="id">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/escapes-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-003.xht
index bf3828cc4d4..d9884cf7285 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-003.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-004.xht
index 18f15f2b4ef..b577a2669bf 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-004.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-005.xht
index ffb259612d6..ce61be8c8f0 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-005.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-006.xht
index 347d20334c3..3cdc18c6c94 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-006.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: green; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-007.xht
index 046c662d058..773c7a2b28c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-007.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p.class { background: red; color: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-008.xht
index 692f7f3598c..4f6bb12d2fb 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-008.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-009.xht
index 44fa8c59bb4..141787b3cd1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-009.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/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="Browsers should be able to ignore the keyword"/>
 <style type="text/css">
@@ -21,6 +22,6 @@ p {color: r\ed}
 </style>
  </head>
  <body>
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-010.xht
index 2b31b22e7bc..49373a8d0bc 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-010.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/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="Unicode escapes cannot substitute for '{' or '}' in CSS syntax."/>
 <style type="text/css">
@@ -23,6 +24,6 @@ p \7B color: red \7D
 </style>
  </head>
  <body>
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-011.xht
index e824e22aed4..a5e111c4788 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-011.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/quotes/001.xml" type="application/xhtml+xml"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
    p { color: green; color: \r\e\d; } /* '\r\e\d' is 'r^N^M', which isn't valid */
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-012.xht
index 7c7fd73d1cc..f6fbf43b997 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-012.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/quotes/002.xml" type="application/xhtml+xml"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
    p { color: red; color: \g\r\45\65\n; } /* 'grEen' */
   </style>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-013.xht
index f4660c6474a..9ca757d504c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-013.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/escaping/003.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets" />
+  <link rel="match" href="reference/escapes-013-ref.xht" />
   <style type="text/css">
    .css\0031 p { color: yellow; background: red; }
    .css\0032 p { color: white; background: green; }
@@ -21,6 +22,6 @@
  </head>
  <body>
   <div class="css1"><p>This line should be unstyled.</p></div>
-  <p class="css2p">This line should be green.</p>
+  <p class="css2p">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/escapes-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-014.xht
index 0b2e012b489..c3af254afeb 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/escapes-014.xht
@@ -14,12 +14,13 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/escaping/004.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets" />
+  <link rel="match" href="reference/ref-green-background.xht" />
   <style type="text/css">
    .test { color: white; background: green; }
    .test { color:\0020yellow; background:\0020red; }
   </style>
  </head>
  <body>
-  <p class="test">This line should be green.</p>
+  <p class="test">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/first-page-vrl-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/first-page-vrl-002.xht
index 29a88c24a94..76e3006244a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/first-page-vrl-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/first-page-vrl-002.xht
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!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>
+ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
   <title>CSS Writing Modes Test: first page of a document with vertical-rl writing-mode</title>
   <style type="text/css">
@@ -14,12 +14,12 @@
           }
 </style>
 
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"/>
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property"/>
-  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages"/>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#page-selectors" title="13.2.2 Page selectors: selecting left, right, and first pages" />
 
-  <meta content="image paged" name="flags"/>
-  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert"/>
+  <meta content="image paged" name="flags" />
+  <meta content="When 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left. This test checks that the first page of a document whose document root has 'writing-mode' set to 'vertical-rl' is the :left page." name="assert" />
 
   <style type="text/css" media="print"><![CDATA[
   html
@@ -49,7 +49,7 @@
 
  <body>
 
-  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled"/></p>
+  <p><img src="support/pass-cdts-first-page-vrl-002.png" alt="Image download support must be enabled" /></p>
 
   <!--
   The image says:
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-003.xht
index d8e6df180e5..3b7f004e4a1 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-003.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-004.xht
index 2833acf2fda..51a48ce3a2a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-004.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-002-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-005.xht
index 5773b62f303..fef30f08459 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-005.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-005-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-006.xht
index e63926def7b..8d10b25c37e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/font-family-invalid-characters-006.xht
@@ -17,6 +17,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
+        <link rel="match" href="reference/font-family-invalid-characters-006-ref.xht" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="Invalid characters in font family names." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-000.xht
index 05dd1191e29..88582dc8078 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-001.xht
index 8a1343c6893..60e3630fb20 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-002.xht
index 3472ecf2812..5932891d278 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-002.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-003.xht
index 4f11e6f563a..6ff3d1dbe66 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-003.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="author" title="Ray Kiddy" href="mailto:ray@ganymede.org"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-004.xht
index 5a4d5beb3e5..3546004b604 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-004.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-005.xht
index 4fc7e5f2b46..bc79e3ce44d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-005.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-006.xht
index 1957f006ec7..2c94e1872af 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-006.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-007.xht
index 5b7dd23e862..a516c72c341 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-007.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-008.xht
index 4270c42c22c..67d5da8fb5d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-008.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <style type="text/css">
 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-009.xht
index ff48e196bc7..536bbde8e1a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-009.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-010.xht
index c27bdf535d2..d78461510b9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-010.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-011.xht
index 1fff4728bfb..4d026515445 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-011.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-012.xht
index 59c67581aae..b5e8c169a40 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-012.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-012-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-013.xht
index 996ba6fc7ba..7c2382f7258 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-013.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
   <style type="text/css">
 
   .one { color: red; background: white; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-020.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-020.xht
index 037547edf39..6ba8f32e16e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/ident-020.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/ident-020.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#characters"/>
+  <link rel="match" href="reference/ident-000-ref.xht"/>
 
   <meta name="flags" content="invalid"/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/import-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/import-000.xht
index 76128e64de2..7a3a2f10d42 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/import-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/import-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
 
   <meta name="flags" content="invalid"/>
   <style type="text/css">
@@ -24,7 +25,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/import-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/import-001.xht
index 454f4a8b8cf..a753720155d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/import-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/import-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
 
   <meta name="flags" content="invalid"/>
   <style type="text/css">
@@ -26,7 +27,7 @@
  </head>
  <body>
 
- <p class="import">This should be green.</p>
+ <p class="import">This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-000.xht
index 7024ddd572c..957cb27220c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#keywords"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <style type="text/css">
 
   p { background: green; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-001.xht
index f623375cd08..46ca9961d0e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/keywords-001.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#keywords"/>
+  <link rel="match" href="reference/keywords-001-ref.xht"/>
   <style type="text/css">
 
   p.one, p.two { width: 10em; border: medium solid; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/list-style-020.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/list-style-020.xht
index f262d00cc25..15cdefb8b8a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/list-style-020.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/list-style-020.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#tokenization"/>
+  <link rel="match" href="reference/list-style-020-ref.xht"/>
   <meta name="assert" content=""/>
   <style type="text/css">
     /* For better readability */
@@ -31,9 +32,8 @@
       display: list-item;
       list-style: disc;
       margin: 0.2em 0 0.2em 4em;
+      border-left: solid thin orange;
     }
-    .inside span { border-left: solid thin orange; }
-    .outside { border-left: solid thin orange; }
 
     .one   { list-style: none; color: red; }
     .two   { list-style: none none; color: red; }
@@ -58,13 +58,13 @@
    <p>Test passes if each word on the right of the orange line
     describes the shape on the left.</p>
 
-   <div class="li one outside"><span>(nothing)</span></div>
-   <div class="li two outside"><span>(nothing)</span></div>
-   <div class="li three outside"><span>blue square</span></div>
-   <div class="li four outside"><span>blue square</span></div>
-   <div class="li five outside"><span>purple diamond</span></div>
-   <div class="li six outside"><span>purple diamond</span></div>
-   <div class="li seven outside"><span>blue circle</span></div>
+   <div class="li one"><span>(nothing)</span></div>
+   <div class="li two"><span>(nothing)</span></div>
+   <div class="li three"><span>blue square</span></div>
+   <div class="li four"><span>blue square</span></div>
+   <div class="li five"><span>purple diamond</span></div>
+   <div class="li six"><span>purple diamond</span></div>
+   <div class="li seven"><span>blue circle</span></div>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-001.xht
index 3d4a6d81ce2..c24c249c96b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-001.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/matching-brackets-001-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing an at-rule by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. "/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-002.xht
index 7f6c5ebe2f4..d4182aabc37 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-002.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/matching-brackets-002-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing a declaration by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. "/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-003.xht
index 543c0d12a18..425bd8b4a23 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/matching-brackets-003.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/media.html#at-media-rule"/>
+  <link rel="match" href="reference/matching-brackets-001-ref.xht"/>
   <meta name="flags" content="invalid"/>
   <meta name="assert" content="User agents must handle unexpected tokens     encountered while parsing a declaration by reading until the end of the     statement, while observing the rules for matching pairs of brackets     and quotes, and correctly handling escapes. "/>
  <!-- simple -->
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-004.xht
index d7f951c5cb3..fe18a16904d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-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/syndata.html#numbers" />
+        <link rel="match" href="reference/ref-filled-black-96px-square.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Integers can be preceded by '+'." />
         <style type="text/css">
@@ -26,7 +27,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a box below.</p>
+        <p>Test passes if there is a filled black square.</p>
         <div></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-006.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-006.xht
index 8900aa6d174..3e61257b267 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-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/syndata.html#length-units" />
+        <link rel="match" href="reference/ref-filled-black-96px-square.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="If a negative length value is set on a property that does not allow negative length values, the declaration is ignored." />
         <style type="text/css">
@@ -26,7 +27,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a box below.</p>
+        <p>Test passes if there is a filled black square.</p>
         <div></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-007.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-007.xht
index fcc4a1437a4..5e5f45dbffe 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-007.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (default) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-009.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-009.xht
index 11b423f471f..f17e59f4569 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-009.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-009-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (pixels) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-010.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-010.xht
index 08ab3e0c566..ad6cae3be11 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-010.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-010-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (inches) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-011.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-011.xht
index 9ce570f32b4..23fc8b3ed3c 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-011.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-011-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="When 'em' is assigned in the value of the 'font-size' property itself, it uses the font size of the parent element." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-012.xht
index 0f0bb8fd3cd..299dc28091e 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-012.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-012-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property (ex) of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-013.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-013.xht
index 0374b85ddd2..44cbfe8bed6 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-013.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-013-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'em' unit is equal to the computed value of the 'font-size' property of the element on which it is used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-015.xht
index fafe21a1756..63c631bf90a 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-015.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-014-ref-a.xht" />
+        <link rel="match" href="reference/numbers-units-014-ref-b.xht" />
         <meta name="flags" content="ahem should" />
         <meta name="assert" content="In the cases where it is impossible or impractical to determine the x-height, a value of 0.5em should be used." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-018.xht
index 0ec94fa1d22..a1db758f753 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-018.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-018-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Units 'em' and 'ex' refer to the initial value of the property when specified on the root element of a document." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-019.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-019.xht
index 7346f905d43..ab9b86f49ae 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-019.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-019.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-019-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'ex' unit size is defined by the element's first available font." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-021.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-021.xht
index 43c02b24b1b..40698c58a86 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-021.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/numbers-units-021.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/syndata.html#length-units" />
+        <link rel="match" href="reference/numbers-units-021-ref.xht" />
         <meta name="flags" content="96dpi ahem" />
         <meta name="assert" content="The 'em' unit refers to the property's initial value when specified on the root element." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/positive-integer-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/positive-integer-001.xht
deleted file mode 100644
index aeee05f849c..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/positive-integer-001.xht
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Test: Parsing signed integers</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 positive-integer-001"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#numbers" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="Positively signed integers are treated the same as non-signed integers." />
-        <style type="text/css">
-            div
-            {
-                background-color: black;
-                height: 0.5in;
-            }
-            #div1
-            {
-                width: +1in;
-            }
-            #div2
-            {
-                width: 1in;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a filled square below.</p>
-        <div id="div1"></div>
-        <div id="div2"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-001.xht
index 723d8f4f6b3..f11dae697f7 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-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/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Single quotes are allowed in strings that are double quoted." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-002.xht
index 4791f5fbaf3..c324f85afa4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-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/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Double quotes are allowed in strings that are single quoted." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-003.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-003.xht
index d8ac58f9440..2479a744516 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-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/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Single quotes cannot occur inside single quotes unless escaped." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-004.xht
index 1afe6909c12..23f510e9e1d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/quoted-string-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/syndata.html#strings" />
+        <link rel="match" href="reference/quoted-string-002-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Double quotes cannot occur inside double quotes unless escaped." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/at-rule-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/at-rule-013-ref.xht
new file mode 100644
index 00000000000..d75a84d6ae9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/at-rule-013-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 at-rule-013-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/attribute-token-selector-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/attribute-token-selector-002-ref.xht
new file mode 100644
index 00000000000..47fe98fc0b2
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/attribute-token-selector-002-ref.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>
+  <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 attribute-token-selector-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/bidi-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/bidi-004-ref.xht
new file mode 100644
index 00000000000..c8b4f46a631
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/bidi-004-ref.xht
@@ -0,0 +1,42 @@
+<!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 bidi-004-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <meta name="flags" content="ahem" />
+
+  <style type="text/css">
+   div p { width: 28em; border: solid; margin: 1em; padding: 0.5em; background: #FFFFCC; color: black; font: 1em/1 Ahem; }
+   .control { line-height: 3em; }
+   .control.start { border-style: solid none solid solid; padding: 0.4em 0 0.4em 1em;  }
+   .control.middle { border-style: solid none solid none; padding: 0.4em 0 0.4em 0;  }
+   .control.end { border-style: solid solid solid none; padding: 0.4em 1em 0.4em 0;  }
+   .a { color: navy; }
+   .b { color: orange; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: א) </p>
+  <div>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+   <p>
+    <span class="control a start">pppp&nbsp;pppX&nbsp;ppXp&nbsp;ppXX&nbsp;pXpp</span><br /><span class="control b start">pXpX</span>&nbsp;pXXp&nbsp;pXXX&nbsp;Xppp<span class="control a end">&nbsp;XppX</span><br /><span class="control b end">XpXp&nbsp;XpXX&nbsp;XXpp&nbsp;XXpX&nbsp;XXXp</span>
+   </p>
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/blocks-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/blocks-001-ref.xht
new file mode 100644
index 00000000000..369277a893e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/blocks-001-ref.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><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 blocks-001-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>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/c547-indent-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/c547-indent-000-ref.xht
new file mode 100644
index 00000000000..d43d7bad2f5
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/c547-indent-000-ref.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><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 c547-indent-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  font: 24px/1 Ahem;
+  width: 18em;
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a tall solid unbroken column of blue below.</p>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+<div> x</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/c5510-padn-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/c5510-padn-000-ref.xht
new file mode 100644
index 00000000000..f30edfc53b3
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/c5510-padn-000-ref.xht
@@ -0,0 +1,51 @@
+<!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 c5510-padn-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  width: 138px;
+  color: orange;
+  font-size: 10px;
+  line-height: 1;
+}
+div p {
+  padding: 0;
+  border: solid 24px yellow;
+}
+img {
+  vertical-align: bottom;
+}
+</style>
+</head>
+<body>
+<p>The five diagrams below should be identical.</p>
+<div>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+ <p>
+    <img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-yellow.png" alt="Image download support must be enabled" width="10" height="10" /><img src="support/swatch-orange.png" alt="Image download support must be enabled" width="10" height="10" />
+ </p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/case-sensitive-003-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/case-sensitive-003-ref.xht
new file mode 100644
index 00000000000..3703e84893b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/case-sensitive-003-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><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 case-sensitive-003-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/case-sensitive-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/case-sensitive-005-ref.xht
new file mode 100644
index 00000000000..c2abedb13f8
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/case-sensitive-005-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 case-sensitive-005-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+span {
+  color: blue;
+  font: larger bold monospace;
+}
+</style>
+</head>
+<body>
+<p>The number 99 must appear below.</p>
+<p><span>9</span><span>9</span></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/color-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/color-000-ref.xht
new file mode 100644
index 00000000000..07d4e983bf1
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/color-000-ref.xht
@@ -0,0 +1,33 @@
+<!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 color-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+<p>This should be green</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/colors-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/colors-006-ref.xht
new file mode 100644
index 00000000000..e9d6d79d973
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/colors-006-ref.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><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 colors-006-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.maroonhex {
+  background: #800000;
+}
+.redhex {
+  background: #ff0000;
+}
+.orangehex {
+  background: #ffa500;
+}
+.yellowhex {
+  background: #ffff00;
+}
+.olivehex {
+  background: #808000;
+}
+.purplehex {
+  background: #800080;
+}
+.fuchsiahex {
+  background: #ff00ff;
+}
+.whitehex {
+  background: #ffffff;
+}
+.limehex {
+  background: #00ff00;
+}
+.greenhex {
+  background: #008000;
+}
+.navyhex {
+  background: #000080;
+}
+.bluehex {
+  background: #0000ff;
+}
+.aquahex {
+  background: #00ffff;
+}
+.tealhex {
+  background: #008080;
+}
+.blackhex {
+  background: #000000;
+}
+.silverhex {
+  background: #c0c0c0;
+}
+.grayhex {
+  background: #808080;
+}
+td {
+  height: 0.5in;
+  width: 0.5in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the first row of boxes below match the second row of boxes below.</p>
+<table>
+  <tr>
+    <td class="maroonhex"></td>
+    <td class="redhex"></td>
+    <td class="orangehex"></td>
+    <td class="yellowhex"></td>
+    <td class="olivehex"></td>
+    <td class="purplehex"></td>
+    <td class="fuchsiahex"></td>
+    <td class="whitehex"></td>
+    <td class="limehex"></td>
+    <td class="greenhex"></td>
+    <td class="navyhex"></td>
+    <td class="bluehex"></td>
+    <td class="aquahex"></td>
+    <td class="tealhex"></td>
+    <td class="blackhex"></td>
+    <td class="silverhex"></td>
+    <td class="grayhex"></td>
+  </tr>
+  <tr>
+    <td class="maroonhex"></td>
+    <td class="redhex"></td>
+    <td class="orangehex"></td>
+    <td class="yellowhex"></td>
+    <td class="olivehex"></td>
+    <td class="purplehex"></td>
+    <td class="fuchsiahex"></td>
+    <td class="whitehex"></td>
+    <td class="limehex"></td>
+    <td class="greenhex"></td>
+    <td class="navyhex"></td>
+    <td class="bluehex"></td>
+    <td class="aquahex"></td>
+    <td class="tealhex"></td>
+    <td class="blackhex"></td>
+    <td class="silverhex"></td>
+    <td class="grayhex"></td>
+  </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-000-ref.xht
new file mode 100644
index 00000000000..50e25ffe840
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-000-ref.xht
@@ -0,0 +1,52 @@
+<!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 content-counter-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+</div>
+<div>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-001-ref.xht
new file mode 100644
index 00000000000..cc98f501751
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-001-ref.xht
@@ -0,0 +1,52 @@
+<!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 content-counter-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+</div>
+<div>
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+z
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-002-ref.xht
new file mode 100644
index 00000000000..8ace6a11d67
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-002-ref.xht
@@ -0,0 +1,57 @@
+<!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 content-counter-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a string of 12 blue filled circles below. (A string of
+12 black circles is provided on the second line for reference.):</p>
+<div id="test">
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+</div>
+<div>
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+•
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-003-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-003-ref.xht
new file mode 100644
index 00000000000..319090b2333
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-003-ref.xht
@@ -0,0 +1,57 @@
+<!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 content-counter-003-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>There should be a string of 12 blue hollow circles below. (A string of
+12 black hollow circles is provided on the second line for reference.):</p>
+<div id="test">
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+</div>
+<div>
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+◦
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-004-ref.xht
new file mode 100644
index 00000000000..a79a35e83fd
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-004-ref.xht
@@ -0,0 +1,42 @@
+<!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 content-counter-004-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  white-space: nowrap;
+}
+
+#test {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there are 12 blue filled squares below.</p>
+<div id="test">
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+◾
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-006-ref.xht
new file mode 100644
index 00000000000..bdc1a235a0f
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-006-ref.xht
@@ -0,0 +1,58 @@
+<!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 content-counter-006-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+99
+100
+101
+</div>
+<div>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+99
+100
+101
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-007-ref.xht
new file mode 100644
index 00000000000..9c5204970bb
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-007-ref.xht
@@ -0,0 +1,66 @@
+<!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 content-counter-007-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+i
+ii
+iii
+iv
+v
+vi
+vii
+viii
+ix
+x
+xi
+xii
+xlix
+l
+ccclxxxix
+cccxc
+mmmcdlxxxix
+mmmcdxc
+mmmcdxci
+</div>
+<div>
+i
+ii
+iii
+iv
+v
+vi
+vii
+viii
+ix
+x
+xi
+xii
+xlix
+l
+ccclxxxix
+cccxc
+mmmcdlxxxix
+mmmcdxc
+mmmcdxci
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-008-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-008-ref.xht
new file mode 100644
index 00000000000..d78f6c754e6
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-008-ref.xht
@@ -0,0 +1,66 @@
+<!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 content-counter-008-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+I
+II
+III
+IV
+V
+VI
+VII
+VIII
+IX
+X
+XI
+XII
+XLIX
+L
+CCCLXXXIX
+CCCXC
+MMMCDLXXXIX
+MMMCDXC
+MMMCDXCI
+</div>
+<div>
+I
+II
+III
+IV
+V
+VI
+VII
+VIII
+IX
+X
+XI
+XII
+XLIX
+L
+CCCLXXXIX
+CCCXC
+MMMCDLXXXIX
+MMMCDXC
+MMMCDXCI
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-009-ref.xht
new file mode 100644
index 00000000000..a26cc119f21
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-009-ref.xht
@@ -0,0 +1,108 @@
+<!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 content-counter-009-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+ა
+ბ
+გ
+დ
+ე
+ვ
+ზ
+ჱ
+თ
+ი
+ია
+იბ
+კ
+ლ
+მ
+ნ
+ჲ
+ო
+პ
+ჟ
+რ
+ს
+ტ
+ჳ
+ფ
+ქ
+ღ
+ყ
+შ
+ჩ
+ც
+ძ
+წ
+ჭ
+ხ
+ჴ
+ჯ
+ჰ
+ჵ
+ჵჰშჟთ
+</div>
+<div>
+ა
+ბ
+გ
+დ
+ე
+ვ
+ზ
+ჱ
+თ
+ი
+ია
+იბ
+კ
+ლ
+მ
+ნ
+ჲ
+ო
+პ
+ჟ
+რ
+ს
+ტ
+ჳ
+ფ
+ქ
+ღ
+ყ
+შ
+ჩ
+ც
+ძ
+წ
+ჭ
+ხ
+ჴ
+ჯ
+ჰ
+ჵ
+ჵჰშჟთ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-010-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-010-ref.xht
new file mode 100644
index 00000000000..35490107414
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-010-ref.xht
@@ -0,0 +1,106 @@
+<!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 content-counter-010-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+Ա
+Բ
+Գ
+Դ
+Ե
+Զ
+Է
+Ը
+Թ
+Ժ
+ԺԱ
+ԺԲ
+Ի
+Լ
+Խ
+Ծ
+Կ
+Հ
+Ձ
+Ղ
+Ճ
+Մ
+Յ
+Ն
+Շ
+Ո
+Չ
+Պ
+Ջ
+Ռ
+Ս
+Վ
+Տ
+Ր
+Ց
+Ւ
+Փ
+Ք
+ՔՋՂԹ
+</div>
+<div>
+Ա
+Բ
+Գ
+Դ
+Ե
+Զ
+Է
+Ը
+Թ
+Ժ
+ԺԱ
+ԺԲ
+Ի
+Լ
+Խ
+Ծ
+Կ
+Հ
+Ձ
+Ղ
+Ճ
+Մ
+Յ
+Ն
+Շ
+Ո
+Չ
+Պ
+Ջ
+Ռ
+Ս
+Վ
+Տ
+Ր
+Ց
+Ւ
+Փ
+Ք
+ՔՋՂԹ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-011-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-011-ref.xht
new file mode 100644
index 00000000000..0285483008a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-011-ref.xht
@@ -0,0 +1,52 @@
+<!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 content-counter-011-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+</div>
+<div>
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-013-ref.xht
new file mode 100644
index 00000000000..f0dedeab3c9
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-013-ref.xht
@@ -0,0 +1,52 @@
+<!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 content-counter-013-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+</div>
+<div>
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-015-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-015-ref.xht
new file mode 100644
index 00000000000..5d82d16e8c8
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/content-counter-015-ref.xht
@@ -0,0 +1,52 @@
+<!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 content-counter-015-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  white-space: nowrap;
+}
+</style>
+</head>
+<body>
+<p>The following two lines should look the same:</p>
+<div>
+α
+β
+γ
+δ
+ε
+ζ
+η
+θ
+ι
+κ
+λ
+μ
+</div>
+<div>
+α
+β
+γ
+δ
+ε
+ζ
+η
+θ
+ι
+κ
+λ
+μ
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-001-ref.xht
new file mode 100644
index 00000000000..e38d669cb0b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-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 core-syntax-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+  text-decoration: underline;
+}
+</style>
+</head>
+<body>
+<p>This sentence should be green and underlined.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-002-ref.xht
new file mode 100644
index 00000000000..c8ffa02fb7b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-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 core-syntax-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p.test {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>There must be no red.</p>
+<p class="test">This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-006-ref.xht
new file mode 100644
index 00000000000..d07c8306410
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-006-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 core-syntax-006-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>This line should be green.</p>
+<div>This line should be green.</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-007-ref.xht
new file mode 100644
index 00000000000..a3a25fc75c0
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/core-syntax-007-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 core-syntax-007-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+body {
+  font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if this text is not dramatically taller than the text below.</p>
+<div>Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-001-ref.xht
new file mode 100644
index 00000000000..fab24d5178a
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-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 counters-001-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 there is a number "1" below.</p>
+<div>1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-003-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-003-ref.xht
new file mode 100644
index 00000000000..28521f20806
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-003-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 counters-003-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the equation below is true.</p>
+<p>I = I</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-004-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-004-ref.xht
new file mode 100644
index 00000000000..0a5b439edd0
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-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 counters-004-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the equation below is true.</p>
+<p>1 = 1</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-010-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-010-ref.xht
new file mode 100644
index 00000000000..40355096f74
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/counters-010-ref.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><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 counters-010-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the equations below are true.</p>
+<p>1 = 1</p>
+<p>1.1 = 1.1</p>
+<p>1.2 = 1.2</p>
+<p>i.iii = i.iii</p>
+<p>I.IV = I.IV</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/declarations-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/declarations-009-ref.xht
new file mode 100644
index 00000000000..f8c50123984
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/declarations-009-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 declarations-009-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+<p>This sentence must be green</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escaped-newline-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escaped-newline-001-ref.xht
new file mode 100644
index 00000000000..2847c5fdb32
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escaped-newline-001-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 escaped-newline-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the words "Filler Text" below are all on the same line.</p>
+<div>Filler Text Filler Text</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escapes-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escapes-000-ref.xht
new file mode 100644
index 00000000000..d701563ca54
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escapes-000-ref.xht
@@ -0,0 +1,22 @@
+<!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 escapes-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>The following three paragraphs should look identical:</p>
+<p>This is a test paragraph.</p>
+<p>This is a test paragraph.</p>
+<p>This is a test paragraph.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escapes-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escapes-013-ref.xht
new file mode 100644
index 00000000000..7fdaa2250a4
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/escapes-013-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 escapes-013-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.green {
+  color: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This line should be unstyled.</p>
+<p class="green">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/font-family-invalid-characters-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht
new file mode 100644
index 00000000000..8c38fd9d633
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/font-family-invalid-characters-005-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</title>
+<link href="http://www.intel.com" rel="author" title="Intel" />
+</head><body>
+  <p>Test passes if there are only numbers (1-4) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+    <div>3</div>
+    <div>4</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht
new file mode 100644
index 00000000000..cb74bcb433e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht
@@ -0,0 +1,10 @@
+<!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" />
+</head><body>
+  <p>Test passes if there are only numbers (1-2) below and no red visible on the page.</p>
+    <div>1</div>
+    <div>2</div>
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ident-000-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ident-000-ref.xht
new file mode 100644
index 00000000000..390cbef44c6
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ident-000-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 ident-000-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ident-012-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ident-012-ref.xht
new file mode 100644
index 00000000000..cfbf0f9715b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/ident-012-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 ident-012-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/keywords-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/keywords-001-ref.xht
new file mode 100644
index 00000000000..1c78cb69e1d
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/keywords-001-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 keywords-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p.test {
+  width: 10em;
+  border: medium solid;
+}
+</style>
+</head>
+<body>
+<p>The next two paragraphs should look identical:</p>
+<p class="test">Test.</p>
+<p class="test">Test.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/list-style-020-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/list-style-020-ref.xht
new file mode 100644
index 00000000000..60698eb8f7b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/list-style-020-ref.xht
@@ -0,0 +1,83 @@
+<!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 list-style-020-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+/* For better readability */
+.li {
+  font-size: 1.5em;
+  color: blue;
+}
+span {
+  color: black;
+  font-size: 0.67em;
+  vertical-align: middle;
+  padding-left: 0.2em;
+}
+
+.li {
+  display: list-item;
+  margin: 0.2em 0 0.2em 4em;
+  border-left: solid thin orange;
+}
+
+.one {
+  list-style-type: none;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.two {
+  list-style-type: none;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.three {
+  list-style-type: square;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.four {
+  list-style-type: square;
+  list-style-image: none;
+  list-style-position: outside;
+}
+.five {
+  list-style-type: none;
+  list-style-image: url(support/diamond.png);
+  list-style-position: outside;
+}
+.six {
+  list-style-type: none;
+  list-style-image: url(support/diamond.png);
+  list-style-position: outside;
+}
+.seven {
+  list-style-type: disc;
+  list-style-image: none;
+  list-style-position: outside;
+}
+</style>
+</head>
+<body>
+<p>Test passes if each word on the right of the orange line
+describes the shape on the left.</p>
+
+<div class="li one"><span>(nothing)</span></div>
+<div class="li two"><span>(nothing)</span></div>
+<div class="li three"><span>blue square</span></div>
+<div class="li four"><span>blue square</span></div>
+<div class="li five"><span>purple diamond</span></div>
+<div class="li six"><span>purple diamond</span></div>
+<div class="li seven"><span>blue circle</span></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/matching-brackets-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/matching-brackets-001-ref.xht
new file mode 100644
index 00000000000..6a265ccd289
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/matching-brackets-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 matching-brackets-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/matching-brackets-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/matching-brackets-002-ref.xht
new file mode 100644
index 00000000000..5fce23fc299
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/matching-brackets-002-ref.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><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 matching-brackets-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-007-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-007-ref.xht
new file mode 100644
index 00000000000..89c2f727cae
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-007-ref.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>
+  <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 numbers-units-007-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  margin-top: 10px;
+  background: black;
+  height: 1em;
+  width: 1em;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-009-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-009-ref.xht
new file mode 100644
index 00000000000..5893311a5d4
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-009-ref.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>
+  <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 numbers-units-009-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  margin-top: 10px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-010-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-010-ref.xht
new file mode 100644
index 00000000000..40d22d323f5
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-010-ref.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>
+  <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 numbers-units-010-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  margin-top: 10px;
+  background: black;
+  height: 1in;
+  width: 1in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-011-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-011-ref.xht
new file mode 100644
index 00000000000..b2438228d51
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-011-ref.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>
+  <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 numbers-units-011-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  margin-top: 10px;
+  background: black;
+  height: 3em;
+  width: 3em;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-012-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-012-ref.xht
new file mode 100644
index 00000000000..91b00bffe4c
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-012-ref.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>
+  <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 numbers-units-012-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  margin-top: 5px;
+  background: black;
+  height: 1in;
+  width: 1in;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the three boxes below are the same size.</p>
+<div></div><div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-013-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-013-ref.xht
new file mode 100644
index 00000000000..d247076b991
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-013-ref.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>
+  <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 numbers-units-013-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  margin-top: 5px;
+  background: black;
+  height: 100px;
+  width: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the three boxes below are the same size.</p>
+<div></div><div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-018-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-018-ref.xht
new file mode 100644
index 00000000000..06fad894a6d
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-018-ref.xht
@@ -0,0 +1,48 @@
+<!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 numbers-units-018-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+html {
+  border: 1px solid;
+  margin-left: 400px;
+  margin-top: 320px;
+}
+p {
+  font: 16px serif;
+}
+div {
+  position: absolute;
+}
+#div1 {
+  background: orange;
+  height: 20px;
+  left: 0;
+  top: 320px;
+  width: 400px;
+}
+#div2 {
+  background: blue;
+  height: 320px;
+  left: 400px;
+  top: 0;
+  width: 20px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the black box containing this text is to the right of the orange box and below the blue box.</p>
+<div id="div1"></div>
+<div id="div2"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-019-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-019-ref.xht
new file mode 100644
index 00000000000..71a3feb122d
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-019-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><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 numbers-units-019-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  font-size: 12pt;
+}
+div {
+  margin-top: 3px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-021-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-021-ref.xht
new file mode 100644
index 00000000000..bbea2ace87e
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/numbers-units-021-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><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 numbers-units-021-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  font-family: serif;
+}
+div {
+  margin-top: 2px;
+  background: black;
+  height: 32px;
+  width: 32px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the two boxes below are the same size.</p>
+<div></div><div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/quoted-string-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/quoted-string-001-ref.xht
new file mode 100644
index 00000000000..327f92a3bfd
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/quoted-string-001-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 quoted-string-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the words "Filler Text" below are single quoted (').</p>
+<div>'Filler Text'</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/quoted-string-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/quoted-string-002-ref.xht
new file mode 100644
index 00000000000..73bb60a368b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/quoted-string-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>
+  <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 quoted-string-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if the words "Filler Text" below are double quoted (").</p>
+<div>"Filler Text"</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/selectors-parsing-001-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/selectors-parsing-001-ref.xht
new file mode 100644
index 00000000000..0b691217654
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/selectors-parsing-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 selectors-parsing-001-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+  background: white;
+}
+</style>
+</head>
+<body>
+<p>This should be green.</p>
+<p>This should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/sgml-comments-002-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/sgml-comments-002-ref.xht
new file mode 100644
index 00000000000..24308b01815
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/sgml-comments-002-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 sgml-comments-002-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>This text should be green.</p>
+<p>This text should be green.</p>
+<p>This text should be green.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/units-005-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/units-005-ref.xht
new file mode 100644
index 00000000000..b550c158d19
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/units-005-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 units-005-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  font-size: 12pt;
+}
+div {
+  width: 8.7em;
+  height: 8.7em;
+  background: green;
+  border: solid lime;
+}
+}
+</style>
+</head>
+<body>
+<p>You should see no red below, just a green square with a green border.</p>
+<div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-012-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-012-ref.xht
new file mode 100644
index 00000000000..e564b6b1382
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-012-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 uri-012-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: green;
+  border: solid green;
+}
+</style>
+</head>
+<body>
+<p>This sentence should be green with a green border.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-016-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-016-ref.xht
new file mode 100644
index 00000000000..282272a211b
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-016-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 uri-016-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p.green {
+  color: green;
+}
+p.white {
+  color: white;
+}
+</style>
+</head>
+<body>
+<p class="green">This sentence must be green and there must be no red.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="green">This sentence must be green and there must be no red.</p>
+<p class="white">There must be no red on this page.</p>
+<p class="white">There must be no red on this page.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-017-ref.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-017-ref.xht
new file mode 100644
index 00000000000..c619325e004
--- /dev/null
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reference/uri-017-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 uri-017-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+p {
+  color: white;
+  background: green;
+}
+</style>
+</head>
+<body>
+<p>This sentence must have a green background.</p>
+<p>This sentence must have a green background.</p>
+</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 aca469ce249..520e93482dd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
@@ -3576,6 +3576,206 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-001" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP Charset vs BOM">
+          <a href="at-charset-001.xht">at-charset-001</a></td>
+        <td><a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-002" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP Charset over @charset">
+          <a href="at-charset-002.xht">at-charset-002</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-003" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over link charset">
+          <a href="at-charset-003.xht">at-charset-003</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-004" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over set referring code page (UTF-8)">
+          <a href="at-charset-004.xht">at-charset-004</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-005" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over set referring code page (windows-1252)">
+          <a href="at-charset-005.xht">at-charset-005</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-006" class="http">
+      <tr>
+        <td rowspan="1" title="HTTP charset over referring code page (not set)">
+          <a href="at-charset-006.xht">at-charset-006</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-007" class="">
+      <tr>
+        <td rowspan="1" title="@charset over link charset attribute">
+          <a href="at-charset-007.xht">at-charset-007</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-008" class="">
+      <tr>
+        <td rowspan="1" title="@charset over referring document's code page (set)">
+          <a href="at-charset-008.xht">at-charset-008</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-009" class="">
+      <tr>
+        <td rowspan="1" title="@charset over referring document's code page (unset)">
+          <a href="at-charset-009.xht">at-charset-009</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-010" class="">
+      <tr>
+        <td rowspan="1" title="Link charset attribute over referring document's codepage (set)">
+          <a href="at-charset-010.xht">at-charset-010</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-011" class="">
+      <tr>
+        <td rowspan="1" title="Link charset attribute over referring document's codepage (not set)">
+          <a href="at-charset-011.xht">at-charset-011</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-012" class="">
+      <tr>
+        <td rowspan="1" title="Stylesheet encoding via the referring document's encoding (set)">
+          <a href="at-charset-012.xht">at-charset-012</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-014" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-8)">
+          <a href="at-charset-014.xht">at-charset-014</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-015" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-16 LE)">
+          <a href="at-charset-015.xht">at-charset-015</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-016" class="">
+      <tr>
+        <td rowspan="1" title="Matching BOM and @charset (utf-16 BE)">
+          <a href="at-charset-016.xht">at-charset-016</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-019" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-8)">
+          <a href="at-charset-019.xht">at-charset-019</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-020" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-16LE)">
+          <a href="at-charset-020.xht">at-charset-020</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-021" class="">
+      <tr>
+        <td rowspan="1" title="BOM with no @charset (utf-16BE)">
+          <a href="at-charset-021.xht">at-charset-021</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-024" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (windows-1252)">
+          <a href="at-charset-024.xht">at-charset-024</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-025" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (Shift-JIS)">
+          <a href="at-charset-025.xht">at-charset-025</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-026" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (ISO-8859-6)">
+          <a href="at-charset-026.xht">at-charset-026</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-027" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (Big5)">
+          <a href="at-charset-027.xht">at-charset-027</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-028" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-8)">
+          <a href="at-charset-028.xht">at-charset-028</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-029" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-16LE)">
+          <a href="at-charset-029.xht">at-charset-029</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-030" class="">
+      <tr>
+        <td rowspan="1" title="@charset specified (UTF-16BE)">
+          <a href="at-charset-030.xht">at-charset-030</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-033" class="">
       <tr>
         <td rowspan="1" title="Non-matching BOM (windows-1252 with UTF-8 BOM)">
@@ -3624,6 +3824,78 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-040" class="">
+      <tr>
+        <td rowspan="1" title="Non-matching @charset (UTF-16BE with UTF-8 @charset)">
+          <a href="at-charset-040.xht">at-charset-040</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-041" class="">
+      <tr>
+        <td rowspan="1" title="Non-matching @charset (UTF-32LE with UTF-16BE @charset)">
+          <a href="at-charset-041.xht">at-charset-041</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-042" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF8 encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-042.xht">at-charset-042</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-043" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF-16LE encoding and BOM with UTF-8 @charset)">
+          <a href="at-charset-043.xht">at-charset-043</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-044" class="">
+      <tr>
+        <td rowspan="1" title="@charset does not match BOM (UTF-32BE encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-044.xht">at-charset-044</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-045" class="">
+      <tr>
+        <td rowspan="1" title="Mismatched endianness in @charset (UTF-16LE encoding and BOM with UTF-16BE @charset)">
+          <a href="at-charset-045.xht">at-charset-045</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-046" class="">
+      <tr>
+        <td rowspan="1" title="Mismatched endianness in @charset (UTF-16BE encoding and BOM with UTF-16LE @charset)">
+          <a href="at-charset-046.xht">at-charset-046</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-047" class="">
+      <tr>
+        <td rowspan="1" title="Endianness not specified (UTF-16LE encoding with UTF-16 @charset)">
+          <a href="at-charset-047.xht">at-charset-047</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-048" class="">
+      <tr>
+        <td rowspan="1" title="Endianness not specified (UTF-16BE encoding with UTF-16 @charset)">
+          <a href="at-charset-048.xht">at-charset-048</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-049" class="">
       <tr>
         <td rowspan="1" title="@charset preceded by a newline">
@@ -3664,6 +3936,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-054" class="">
+      <tr>
+        <td rowspan="1" title="@charset in uppercase">
+          <a href="at-charset-054.xht">at-charset-054</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-055" class="">
       <tr>
         <td rowspan="1" title="@charset without quotes">
@@ -3672,6 +3952,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-056" class="">
+      <tr>
+        <td rowspan="1" title="@charset missing a space">
+          <a href="at-charset-056.xht">at-charset-056</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-057" class="">
       <tr>
         <td rowspan="1" title="@charset escaped numerically">
@@ -3696,6 +3984,78 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-charset-060" class="">
+      <tr>
+        <td rowspan="1" title="@charset with bogus name">
+          <a href="at-charset-060.xht">at-charset-060</a></td>
+        <td><a href="at-charset-001.xht">=</a> <a href="reference/at-charset-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-061" class="">
+      <tr>
+        <td rowspan="1" title="@charset within style block">
+          <a href="at-charset-061.xht">at-charset-061</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-071" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-1">
+          <a href="at-charset-071.xht">at-charset-071</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-072" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-11">
+          <a href="at-charset-072.xht">at-charset-072</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-073" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-5">
+          <a href="at-charset-073.xht">at-charset-073</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-074" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-6">
+          <a href="at-charset-074.xht">at-charset-074</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-075" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-7">
+          <a href="at-charset-075.xht">at-charset-075</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-076" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: ISO-8859-8">
+          <a href="at-charset-076.xht">at-charset-076</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-charset-077" class="http">
+      <tr>
+        <td rowspan="1" title="Stylesheet encodings: KOI8-R">
+          <a href="at-charset-077.xht">at-charset-077</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="at-charset-quotes-001" class="">
       <tr>
         <td rowspan="1" title="@charset quotes">
@@ -3816,6 +4176,54 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="at-import-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following a known but invalid @rule">
+          <a href="at-import-009.xht">at-import-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-import-010" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following an invalid selector">
+          <a href="at-import-010.xht">at-import-010</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-import-011" class="invalid">
+      <tr>
+        <td rowspan="1" title="@import following garbage">
+          <a href="at-import-011.xht">at-import-011</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-000" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-000.xht">at-keywords-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-001" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-001.xht">at-keywords-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-keywords-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-keywords-002.xht">at-keywords-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="at-rule-001" class="invalid">
       <tr>
         <td rowspan="1" title="Parser error handling with invalid at-rules: @ invalid selector">
@@ -3912,6 +4320,54 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="at-rule-013" class="invalid">
+      <tr>
+        <td rowspan="1" title="Ignoring at-rules inside @media blocks">
+          <a href="at-rule-013.xht">at-rule-013</a></td>
+        <td><a href="reference/at-rule-013-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-000.xht">at-rules-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-001" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-001.xht">at-rules-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-002" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-002.xht">at-rules-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-003" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-003.xht">at-rules-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="at-rules-004" class="">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="at-rules-004.xht">at-rules-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="attribute-selector-001" class="">
       <tr>
         <td rowspan="1" title="ID selector without value and no matching element">
@@ -3928,6 +4384,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="attribute-token-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="[attr~=&quot;&quot;]Attribute Selectors with Empty String Values">
+          <a href="attribute-token-selector-002.xht">attribute-token-selector-002</a></td>
+        <td><a href="reference/attribute-token-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="attribute-value-selector-004" class="invalid">
       <tr>
         <td rowspan="1" title="Numeric attributes">
@@ -8080,6 +8544,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="bidi-004" class="ahem may21">
+      <tr>
+        <td rowspan="1" title="The bidi algorithm and inlines in CSS">
+          <a href="bidi-004.xht">bidi-004</a></td>
+        <td><a href="reference/bidi-004-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may21" title="Behavior tested is preferred but optional">Optional</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="bidi-005a" class="">
       <tr>
         <td rowspan="1" title="The bidi algorithm and inlines in CSS: embed levels and white-space: pre;">
@@ -9416,6 +9888,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="blocks-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Parsing nested blocks and strings in style blocks">
+          <a href="blocks-001.xht">blocks-001</a></td>
+        <td><a href="reference/blocks-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="blocks-002" class="">
       <tr>
         <td rowspan="1" title="Empty declaration block">
@@ -19724,6 +20204,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="c547-indent-000" class="ahem">
+      <tr>
+        <td rowspan="1" title="text-indent">
+          <a href="c547-indent-000.xht">c547-indent-000</a></td>
+        <td><a href="reference/c547-indent-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="c547-indent-001" class="">
       <tr>
         <td rowspan="1" title="text-indent">
@@ -20220,6 +20708,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="c5510-padn-000" class="ahem image">
+      <tr>
+        <td rowspan="1" title="padding">
+          <a href="c5510-padn-000.xht">c5510-padn-000</a></td>
+        <td><a href="reference/c5510-padn-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="c5510-padn-001" class="ahem">
       <tr>
         <td rowspan="1" title="padding">
@@ -20636,6 +21132,110 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="cascade-import-dynamic-001" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet append (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-001.xht">cascade-import-dynamic-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-002" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet append (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-002.xht">cascade-import-dynamic-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-003" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet insertion (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-003.xht">cascade-import-dynamic-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-004" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet insertion (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-004.xht">cascade-import-dynamic-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-005" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet deletion (&lt;style&gt;)">
+          <a href="cascade-import-dynamic-005.xht">cascade-import-dynamic-005</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-006" class="">
+      <tr>
+        <td rowspan="1" title="Dynamic sheet deletion (&lt;link&gt;)">
+          <a href="cascade-import-dynamic-006.xht">cascade-import-dynamic-006</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="cascade-import-dynamic-control" class="">
+      <tr>
+        <td rowspan="1" title="Control test">
+          <a href="cascade-import-dynamic-control.xht">cascade-import-dynamic-control</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-000" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of Properties and Keywords (background)">
+          <a href="case-sensitive-000.xht">case-sensitive-000</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-001" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of At-rules (@media)">
+          <a href="case-sensitive-001.xht">case-sensitive-001</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-003" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of pseudo-classes and pseudo-elements">
+          <a href="case-sensitive-003.xht">case-sensitive-003</a></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-004" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of :lang() arguments">
+          <a href="case-sensitive-004.xht">case-sensitive-004</a></td>
+        <td><a href="reference/case-sensitive-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-005" class="">
+      <tr>
+        <td rowspan="1" title="Case-sensitivity of counter names">
+          <a href="case-sensitive-005.xht">case-sensitive-005</a></td>
+        <td><a href="reference/case-sensitive-005-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="case-sensitive-007" class="nonHTML">
+      <tr>
+        <td rowspan="1" title="Case sensitivity with element selectors">
+          <a href="case-sensitive-007.xht">case-sensitive-007</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="charset-attr-001" class="">
       <tr>
         <td rowspan="1" title="@charset test-attribute">
@@ -21388,6 +21988,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="color-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="RGB color syntax error handling">
+          <a href="color-000.xht">color-000</a></td>
+        <td><a href="reference/color-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="color-001" class="ahem invalid">
       <tr>
         <td rowspan="1" title="Color set to hex with 5 digits which is invalid and is equivalent to minimum minus one value for 6 digit hex">
@@ -22724,6 +23332,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="colors-006" class="">
+      <tr>
+        <td rowspan="1" title="Comparing color keywords and hex values">
+          <a href="colors-006.xht">colors-006</a></td>
+        <td><a href="reference/colors-006-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="colors-007" class="invalid">
       <tr>
         <td rowspan="1" title="Color keyword syntax">
@@ -23068,6 +23684,142 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="content-counter-000" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c)">
+          <a href="content-counter-000.xht">content-counter-000</a></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-001" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, none)">
+          <a href="content-counter-001.xht">content-counter-001</a></td>
+        <td><a href="reference/content-counter-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-002" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, disc)">
+          <a href="content-counter-002.xht">content-counter-002</a></td>
+        <td><a href="reference/content-counter-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-003" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, circle)">
+          <a href="content-counter-003.xht">content-counter-003</a></td>
+        <td><a href="reference/content-counter-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-004" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, square)">
+          <a href="content-counter-004.xht">content-counter-004</a></td>
+        <td><a href="reference/content-counter-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-005" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, decimal)">
+          <a href="content-counter-005.xht">content-counter-005</a></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-006" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, decimal-leading-zero)">
+          <a href="content-counter-006.xht">content-counter-006</a></td>
+        <td><a href="reference/content-counter-006-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-007" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-roman)">
+          <a href="content-counter-007.xht">content-counter-007</a></td>
+        <td><a href="reference/content-counter-007-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-008" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-roman)">
+          <a href="content-counter-008.xht">content-counter-008</a></td>
+        <td><a href="reference/content-counter-008-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-009" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, georgian)">
+          <a href="content-counter-009.xht">content-counter-009</a></td>
+        <td><a href="reference/content-counter-009-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-010" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, armenian)">
+          <a href="content-counter-010.xht">content-counter-010</a></td>
+        <td><a href="reference/content-counter-010-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-011" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-latin)">
+          <a href="content-counter-011.xht">content-counter-011</a></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-012" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-alpha)">
+          <a href="content-counter-012.xht">content-counter-012</a></td>
+        <td><a href="reference/content-counter-011-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-013" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-latin)">
+          <a href="content-counter-013.xht">content-counter-013</a></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-014" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, upper-alpha)">
+          <a href="content-counter-014.xht">content-counter-014</a></td>
+        <td><a href="reference/content-counter-013-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-015" class="">
+      <tr>
+        <td rowspan="1" title="content: counter(c, lower-greek)">
+          <a href="content-counter-015.xht">content-counter-015</a></td>
+        <td><a href="reference/content-counter-015-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="content-counter-016" class="invalid">
+      <tr>
+        <td rowspan="1" title="content: counter() error cases">
+          <a href="content-counter-016.xht">content-counter-016</a></td>
+        <td><a href="reference/content-counter-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="content-inherit-002" class="">
       <tr>
         <td rowspan="1" title="CSS inheritance: content with tables">
@@ -23092,6 +23844,70 @@
         <td rowspan="1"><abbr class="http" title="Requires HTTP headers">HTTP</abbr></td>
       </tr>
     </tbody>
+    <tbody id="core-syntax-001" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places">
+          <a href="core-syntax-001.xht">core-syntax-001</a></td>
+        <td><a href="reference/core-syntax-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-002" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places">
+          <a href="core-syntax-002.xht">core-syntax-002</a></td>
+        <td><a href="reference/core-syntax-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-003" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places (with no whitespace)">
+          <a href="core-syntax-003.xht">core-syntax-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-004" class="">
+      <tr>
+        <td rowspan="1" title="Nested blocks in unexpected places (with no whitespace)">
+          <a href="core-syntax-004.xht">core-syntax-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-006" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-006.xht">core-syntax-006</a></td>
+        <td><a href="reference/core-syntax-006-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-007" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-007.xht">core-syntax-007</a></td>
+        <td><a href="reference/core-syntax-007-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-008" class="">
+      <tr>
+        <td rowspan="1" title="Parsing invalid '!' declarations">
+          <a href="core-syntax-008.xht">core-syntax-008</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="core-syntax-009" class="">
+      <tr>
+        <td rowspan="1" title="Syntactic White Space">
+          <a href="core-syntax-009.xht">core-syntax-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="counter-reset-increment-002" class="">
       <tr>
         <td rowspan="1" title="counter-reset - negative value with positive counter-increment">
@@ -23100,6 +23916,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="counters-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter functions with just the identifier">
+          <a href="counters-001.xht">counters-001</a></td>
+        <td><a href="reference/counters-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="counters-002" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid counter functions - Too many arguments">
@@ -23108,6 +23932,118 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="counters-003" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with no white space">
+          <a href="counters-003.xht">counters-003</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with no white space and two function values">
+          <a href="counters-004.xht">counters-004</a></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-005" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with no white space and three function values">
+          <a href="counters-005.xht">counters-005</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-006" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with white space">
+          <a href="counters-006.xht">counters-006</a></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-007" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counter() function with white space and two function values">
+          <a href="counters-007.xht">counters-007</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-008" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with white space and two function values">
+          <a href="counters-008.xht">counters-008</a></td>
+        <td><a href="reference/counters-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-009" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() function with white space and three function values">
+          <a href="counters-009.xht">counters-009</a></td>
+        <td><a href="reference/counters-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="counters-010" class="">
+      <tr>
+        <td rowspan="1" title="Parsing counters() functions">
+          <a href="counters-010.xht">counters-010</a></td>
+        <td><a href="reference/counters-010-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing ':', value, part 1">
+          <a href="declaration-001.xht">declaration-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing ':', value, part 2">
+          <a href="declaration-002.xht">declaration-002</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing value, part 1">
+          <a href="declaration-003.xht">declaration-003</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-004" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration missing value, part 2">
+          <a href="declaration-004.xht">declaration-004</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-005" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration: unexpected tokens { }, part 1">
+          <a href="declaration-005.xht">declaration-005</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="declaration-006" class="invalid">
+      <tr>
+        <td rowspan="1" title="malformed declaration: unexpected tokens { }, part 2">
+          <a href="declaration-006.xht">declaration-006</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="declaration-whitespace-001" class="">
       <tr>
         <td rowspan="1" title="Parsing white space in style declaration">
@@ -23116,6 +24052,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="declarations-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="Ignoring at-rules inside declaration blocks">
+          <a href="declarations-009.xht">declarations-009</a></td>
+        <td><a href="reference/declarations-009-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="default-attribute-selector-001" class="">
       <tr>
         <td rowspan="1" title="attribute selector - Default attribute values in DTDs">
@@ -23812,6 +24756,134 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="escaped-newline-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing strings with escaped newlines">
+          <a href="escaped-newline-001.xht">escaped-newline-001</a></td>
+        <td><a href="reference/escaped-newline-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-000" class="">
+      <tr>
+        <td rowspan="1" title="Escaped Newline in String">
+          <a href="escapes-000.xht">escapes-000</a></td>
+        <td><a href="reference/escapes-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-001" class="">
+      <tr>
+        <td rowspan="1" title="Escaped Quote Marks in String">
+          <a href="escapes-001.xht">escapes-001</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-002" class="">
+      <tr>
+        <td rowspan="1" title="Invalid Punctuation Escapes">
+          <a href="escapes-002.xht">escapes-002</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-003" class="">
+      <tr>
+        <td rowspan="1" title="Class and Keyword Letter Escapes">
+          <a href="escapes-003.xht">escapes-003</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-004" class="">
+      <tr>
+        <td rowspan="1" title="Unicode Escapes">
+          <a href="escapes-004.xht">escapes-004</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-005" class="">
+      <tr>
+        <td rowspan="1" title="Unicode Escapes and Case Insensitivity">
+          <a href="escapes-005.xht">escapes-005</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-006" class="">
+      <tr>
+        <td rowspan="1" title="Incorrect Letter Escape (Class Selector)">
+          <a href="escapes-006.xht">escapes-006</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-007" class="">
+      <tr>
+        <td rowspan="1" title="Space-terminated Unicode Escapes">
+          <a href="escapes-007.xht">escapes-007</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-008" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Space-terminated Character Escapes">
+          <a href="escapes-008.xht">escapes-008</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-009" class="invalid">
+      <tr>
+        <td rowspan="1" title="Characters and case: Escaping a character inside a keyword">
+          <a href="escapes-009.xht">escapes-009</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-010" class="invalid">
+      <tr>
+        <td rowspan="1" title="Unicode-escaped Braces">
+          <a href="escapes-010.xht">escapes-010</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-011" class="">
+      <tr>
+        <td rowspan="1" title="CSS Parsing: Escaped keywords">
+          <a href="escapes-011.xht">escapes-011</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-012" class="">
+      <tr>
+        <td rowspan="1" title="CSS Parsing: Escaped keywords">
+          <a href="escapes-012.xht">escapes-012</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-013" class="">
+      <tr>
+        <td rowspan="1" title="Escaping and spaces with classes">
+          <a href="escapes-013.xht">escapes-013</a></td>
+        <td><a href="reference/escapes-013-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="escapes-014" class="">
+      <tr>
+        <td rowspan="1" title="Escaping and spaces with declarations">
+          <a href="escapes-014.xht">escapes-014</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="escapes-015" class="invalid">
       <tr>
         <td rowspan="1" title="Escape of non-printable characters within declarations, applying to property values">
@@ -26212,6 +27284,38 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="font-family-invalid-characters-003" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid curly brackets and pair matching">
+          <a href="font-family-invalid-characters-003.xht">font-family-invalid-characters-003</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-004" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid square brackets and pair matching">
+          <a href="font-family-invalid-characters-004.xht">font-family-invalid-characters-004</a></td>
+        <td><a href="reference/font-family-invalid-characters-002-ref.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>
+    <tbody id="font-family-invalid-characters-005" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid quotes and pair matching">
+          <a href="font-family-invalid-characters-005.xht">font-family-invalid-characters-005</a></td>
+        <td><a href="reference/font-family-invalid-characters-005-ref.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>
+    <tbody id="font-family-invalid-characters-006" class="ahem invalid">
+      <tr>
+        <td rowspan="1" title="Invalid single quotes and pair matching">
+          <a href="font-family-invalid-characters-006.xht">font-family-invalid-characters-006</a></td>
+        <td><a href="reference/font-family-invalid-characters-006-ref.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>
     <tbody id="font-family-name-001" class="font">
       <tr>
         <td rowspan="1" title="font family name with no quotes">
@@ -27948,6 +29052,118 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="ident-000" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (a-z) as Classes and IDs">
+          <a href="ident-000.xht">ident-000</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-001" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (-_a-zA-Z0-9) as Classes and IDs">
+          <a href="ident-001.xht">ident-001</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-002" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with _) as Classes and IDs">
+          <a href="ident-002.xht">ident-002</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with -) as Classes and IDs">
+          <a href="ident-003.xht">ident-003</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-004" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with ideographic) as Classes and IDs">
+          <a href="ident-004.xht">ident-004</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-005" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including ideographic) as Classes and IDs">
+          <a href="ident-005.xht">ident-005</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-006" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escape) as Classes and IDs">
+          <a href="ident-006.xht">ident-006</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-007" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including escape) as Classes and IDs">
+          <a href="ident-007.xht">ident-007</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-008" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Identifiers (starting with digit) as Classes and IDs">
+          <a href="ident-008.xht">ident-008</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-009" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including digits) as Classes and IDs">
+          <a href="ident-009.xht">ident-009</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-010" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escape) as Classes and IDs">
+          <a href="ident-010.xht">ident-010</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-011" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (including escapes) as Classes and IDs">
+          <a href="ident-011.xht">ident-011</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-012" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escaped digits, control codes) as Classes and IDs">
+          <a href="ident-012.xht">ident-012</a></td>
+        <td><a href="reference/ident-012-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="ident-013" class="">
+      <tr>
+        <td rowspan="1" title="Valid Identifiers (starting with escaped -) as Classes and IDs">
+          <a href="ident-013.xht">ident-013</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="ident-014" class="">
       <tr>
         <td rowspan="1" title="Selector attributes and hyphens">
@@ -27996,6 +29212,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="ident-020" class="invalid">
+      <tr>
+        <td rowspan="1" title="Invalid Identifiers (starting with double -) as Classes and IDs">
+          <a href="ident-020.xht">ident-020</a></td>
+        <td><a href="reference/ident-000-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="ignored-rules-001" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid rules that precede good rules">
@@ -28052,6 +29276,22 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="import-000" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="import-000.xht">import-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="import-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="At-rules">
+          <a href="import-001.xht">import-001</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="inherit-static-offset-001" class="image">
       <tr>
         <td rowspan="1" title="top and left - inherit keyword on element with statically positioned parent">
@@ -29236,6 +30476,22 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="keywords-000" class="">
+      <tr>
+        <td rowspan="1" title="Keywords v. Strings (background)">
+          <a href="keywords-000.xht">keywords-000</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="keywords-001" class="">
+      <tr>
+        <td rowspan="1" title="Keywords v. Strings (width)">
+          <a href="keywords-001.xht">keywords-001</a></td>
+        <td><a href="reference/keywords-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="lang-selector-002" class="invalid">
       <tr>
         <td rowspan="1" title="Empty :lang selector">
@@ -30460,6 +31716,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
+    <tbody id="list-style-020" class="">
+      <tr>
+        <td rowspan="1" title="'list-style' shorthand and 'none' values">
+          <a href="list-style-020.xht">list-style-020</a></td>
+        <td><a href="reference/list-style-020-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="list-style-021" class="image">
       <tr>
         <td rowspan="1" title="list-style: none - followed by a list-style-image reset">
@@ -33468,6 +34732,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="matching-brackets-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for @rules">
+          <a href="matching-brackets-001.xht">matching-brackets-001</a></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="matching-brackets-002" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for declarations">
+          <a href="matching-brackets-002.xht">matching-brackets-002</a></td>
+        <td><a href="reference/matching-brackets-002-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="matching-brackets-003" class="invalid">
+      <tr>
+        <td rowspan="1" title="Matching brackets and quotes for selectors">
+          <a href="matching-brackets-003.xht">matching-brackets-003</a></td>
+        <td><a href="reference/matching-brackets-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="max-height-001" class="invalid">
       <tr>
         <td rowspan="1" title="Max-height using pixels with a minimum minus one value, -1px">
@@ -36540,6 +37828,14 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing integer numbers with '+'">
+          <a href="numbers-units-004.xht">numbers-units-004</a></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="numbers-units-005" class="">
       <tr>
         <td rowspan="1" title="Optional unit identifier after 0">
@@ -36548,6 +37844,73 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-006" class="invalid">
+      <tr>
+        <td rowspan="1" title="Unsupported negative values">
+          <a href="numbers-units-006.xht">numbers-units-006</a></td>
+        <td><a href="reference/ref-filled-black-96px-square.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-007" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em sizes">
+          <a href="numbers-units-007.xht">numbers-units-007</a></td>
+        <td><a href="reference/numbers-units-007-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-009" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with the font-size set to px size">
+          <a href="numbers-units-009.xht">numbers-units-009</a></td>
+        <td><a href="reference/numbers-units-009-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-010" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to inch">
+          <a href="numbers-units-010.xht">numbers-units-010</a></td>
+        <td><a href="reference/numbers-units-010-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-011" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to em">
+          <a href="numbers-units-011.xht">numbers-units-011</a></td>
+        <td><a href="reference/numbers-units-011-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-012" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to ex">
+          <a href="numbers-units-012.xht">numbers-units-012</a></td>
+        <td><a href="reference/numbers-units-012-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-013" class="ahem">
+      <tr>
+        <td rowspan="1" title="Em size with font-size set to percentage">
+          <a href="numbers-units-013.xht">numbers-units-013</a></td>
+        <td><a href="reference/numbers-units-013-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-015" class="ahem should">
+      <tr>
+        <td rowspan="2" title="Height of EX">
+          <a href="numbers-units-015.xht">numbers-units-015</a></td>
+        <td><a href="reference/numbers-units-014-ref-a.xht">=</a> </td>
+        <td rowspan="2"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="should" title="Behavior tested is recommended but not required">Recommend</abbr></td>
+      </tr>
+      <tr>
+        <td><a href="reference/numbers-units-014-ref-a.xht">=</a></td>
+      </tr>
+    </tbody>
     <tbody id="numbers-units-016" class="invalid">
       <tr>
         <td rowspan="1" title="Parsing invalid percentage values - decimal value with multiple decimals">
@@ -36564,6 +37927,30 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="numbers-units-018" class="ahem">
+      <tr>
+        <td rowspan="1" title="Specifying em/ex on the root element">
+          <a href="numbers-units-018.xht">numbers-units-018</a></td>
+        <td><a href="reference/numbers-units-018-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-019" class="ahem">
+      <tr>
+        <td rowspan="1" title="First available font defines the 'ex' unit size">
+          <a href="numbers-units-019.xht">numbers-units-019</a></td>
+        <td><a href="reference/numbers-units-019-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="numbers-units-021" class="96dpi ahem">
+      <tr>
+        <td rowspan="1" title="Root element and the 'em' unit size">
+          <a href="numbers-units-021.xht">numbers-units-021</a></td>
+        <td><a href="reference/numbers-units-021-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="96dpi" title="Only valid on 96dpi displays">96</abbr><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="other-attribute-001" class="">
       <tr>
         <td rowspan="1" title="Function 'attr()' referencing another elements attribute data">
@@ -40316,6 +41703,38 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="quoted-string-001" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of single quotes inside double quotes">
+          <a href="quoted-string-001.xht">quoted-string-001</a></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-002" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of double quotes inside single quotes">
+          <a href="quoted-string-002.xht">quoted-string-002</a></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-003" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of escaped quotes (single within single)">
+          <a href="quoted-string-003.xht">quoted-string-003</a></td>
+        <td><a href="reference/quoted-string-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="quoted-string-004" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of escaped double quotes">
+          <a href="quoted-string-004.xht">quoted-string-004</a></td>
+        <td><a href="reference/quoted-string-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="quotes-035" class="should">
       <tr>
         <td rowspan="1" title="CSS and Quotes: Counting Right (Slightly Simpler Version)">
@@ -42044,6 +43463,14 @@
         <td rowspan="1"><abbr class="dom" title="Requires Document Object Model support">DOM/JS</abbr></td>
       </tr>
     </tbody>
+    <tbody id="selectors-parsing-001" class="">
+      <tr>
+        <td rowspan="1" title="CSS: Selector Parsing and Invalid Pseudo-Elements">
+          <a href="selectors-parsing-001.xht">selectors-parsing-001</a></td>
+        <td><a href="reference/selectors-parsing-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="separated-border-model-003a" class="">
       <tr>
         <td rowspan="1" title="table width as set when greater than sum of columns width">
@@ -42124,6 +43551,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="sgml-comments-000" class="">
+      <tr>
+        <td rowspan="1" title="SGML comments">
+          <a href="sgml-comments-000.xht">sgml-comments-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="sgml-comments-001" class="">
       <tr>
         <td rowspan="1" title="Parsing SGML comments">
@@ -42132,6 +43567,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="sgml-comments-002" class="">
+      <tr>
+        <td rowspan="1" title="Parsing of CDO/CDC in stylesheets">
+          <a href="sgml-comments-002.xht">sgml-comments-002</a></td>
+        <td><a href="reference/sgml-comments-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="shand-border-000" class="">
       <tr>
         <td rowspan="1" title="Shorthand Properties (border)">
@@ -42308,6 +43751,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="strings-000" class="">
+      <tr>
+        <td rowspan="1" title="Newlines in strings">
+          <a href="strings-000.xht">strings-000</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="style-attr-cascade-001" class="">
       <tr>
         <td rowspan="1" title="CSS: style attributes vs. important tag selector">
@@ -43604,6 +45055,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="units-005" class="">
+      <tr>
+        <td rowspan="1" title="Units: em (0.87em floats)">
+          <a href="units-005.xht">units-005</a></td>
+        <td><a href="reference/units-005-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="units-006" class="ahem">
       <tr>
         <td rowspan="1" title="Units: px and font-size">
@@ -43644,6 +45103,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="unterminated-string-001" class="invalid">
+      <tr>
+        <td rowspan="1" title="Error handling of unterminated strings">
+          <a href="unterminated-string-001.xht">unterminated-string-001</a></td>
+        <td><a href="reference/filler-text-below-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-001" class="">
       <tr>
         <td rowspan="1" title="Parsing valid URIs with white space and no quotes">
@@ -43668,6 +45135,22 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-004" class="image">
+      <tr>
+        <td rowspan="1" title="URL function with URI that has escaped special chars">
+          <a href="uri-004.xht">uri-004</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-005" class="image">
+      <tr>
+        <td rowspan="1" title="URL function with escaped special chars - single quote">
+          <a href="uri-005.xht">uri-005</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-006" class="image invalid">
       <tr>
         <td rowspan="1" title="Invalid character (*) after URL function values">
@@ -43716,6 +45199,14 @@
         <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-012" class="invalid">
+      <tr>
+        <td rowspan="1" title="Error handling of broken url() - balancing braces">
+          <a href="uri-012.xht">uri-012</a></td>
+        <td><a href="reference/uri-012-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="uri-013" class="invalid">
       <tr>
         <td rowspan="1" title="handling of invalid url() functions">
@@ -43724,6 +45215,46 @@
         <td rowspan="1"><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
       </tr>
     </tbody>
+    <tbody id="uri-014" class="">
+      <tr>
+        <td rowspan="1" title="Unquoted commas in url()">
+          <a href="uri-014.xht">uri-014</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-015" class="">
+      <tr>
+        <td rowspan="1" title="Escaped url() functional notation">
+          <a href="uri-015.xht">uri-015</a></td>
+        <td><a href="reference/ref-green-background.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-016" class="">
+      <tr>
+        <td rowspan="1" title="Error handling of broken url() with open /*">
+          <a href="uri-016.xht">uri-016</a></td>
+        <td><a href="reference/uri-016-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-017" class="image invalid">
+      <tr>
+        <td rowspan="1" title="Unclosed URI Token at EOF (in declaration)">
+          <a href="uri-017.xht">uri-017</a></td>
+        <td><a href="reference/uri-017-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
+    <tbody id="uri-018" class="image invalid">
+      <tr>
+        <td rowspan="1" title="Unclosed URI Token at EOF (in @import)">
+          <a href="uri-018.xht">uri-018</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr><abbr class="invalid" title="Tests invalid CSS">Invalid</abbr></td>
+      </tr>
+    </tbody>
     <tbody id="vertical-align-004" class="ahem">
       <tr>
         <td rowspan="1" title="Vertical-align using pixels with a negative zero value, -0px">
@@ -44548,6 +46079,22 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
+    <tbody id="whitespace-001" class="">
+      <tr>
+        <td rowspan="1" title="White space - em-space (U+2003)">
+          <a href="whitespace-001.xht">whitespace-001</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="whitespace-002" class="">
+      <tr>
+        <td rowspan="1" title="White space - ideographic space (U+3000)">
+          <a href="whitespace-002.xht">whitespace-002</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="width-001" class="invalid">
       <tr>
         <td rowspan="1" title="Width using pixels with a minimum minus one value, -1px">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
index bd98a9359cc..f827c2fb8e9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
@@ -443,21 +443,66 @@ anonymous-boxes-001b.xht == reference/anonymous-boxes-001b-ref.xht
 anonymous-boxes-inheritance-001.xht == reference/anonymous-boxes-inheritance-001-ref.xht
 anonymous-inline-whitespace-001.xht == reference/ref-if-there-is-no-red.xht
 anonymous-table-box-width-001.xht == reference/ref-filled-green-100px-square.xht
+at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-002.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-003.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-004.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-005.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-006.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-007.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-008.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-009.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-010.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-011.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-012.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-014.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-015.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-016.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-019.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-020.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-021.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-024.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-025.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-026.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-027.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-028.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-029.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-030.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
 at-charset-033.xht == reference/filler-text-below-green.xht
 at-charset-034.xht == reference/filler-text-below-green.xht
 at-charset-035.xht == reference/filler-text-below-green.xht
 at-charset-036.xht == reference/filler-text-below-green.xht
 at-charset-037.xht == reference/filler-text-below-green.xht
 at-charset-038.xht == reference/filler-text-below-green.xht
+at-charset-040.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-041.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-042.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-043.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-044.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-045.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-046.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-047.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-048.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
 at-charset-049.xht == reference/filler-text-below-green.xht
 at-charset-050.xht == reference/filler-text-below-green.xht
 at-charset-051.xht == reference/filler-text-below-green.xht
 at-charset-052.xht == reference/filler-text-below-green.xht
 at-charset-053.xht == reference/filler-text-below-green.xht
+at-charset-054.xht == reference/filler-text-below-green.xht
 at-charset-055.xht == reference/filler-text-below-green.xht
+at-charset-056.xht == reference/filler-text-below-green.xht
 at-charset-057.xht == reference/filler-text-below-green.xht
 at-charset-058.xht == reference/filler-text-below-green.xht
 at-charset-059.xht == reference/filler-text-below-green.xht
+at-charset-060.xht == at-charset-001.xht == reference/at-charset-001-ref.xht
+at-charset-061.xht == reference/filler-text-below-green.xht
+at-charset-071.xht == reference/ref-green-background.xht
+at-charset-072.xht == reference/ref-green-background.xht
+at-charset-073.xht == reference/ref-green-background.xht
+at-charset-074.xht == reference/ref-green-background.xht
+at-charset-075.xht == reference/ref-green-background.xht
+at-charset-076.xht == reference/ref-green-background.xht
+at-charset-077.xht == reference/ref-green-background.xht
 at-charset-quotes-001.xht == reference/at-charset-ref.xht
 at-charset-space-001.xht == reference/at-charset-ref.xht
 at-charset-space-002.xht == reference/at-charset-ref.xht
@@ -473,6 +518,12 @@ at-import-004.xht == reference/no-red-filler-text-ref.xht
 at-import-005.xht == reference/filler-text-below-green.xht
 at-import-006.xht == reference/filler-text-below-green.xht
 at-import-007.xht == reference/filler-text-below-green.xht
+at-import-009.xht == reference/ref-this-text-should-be-green.xht
+at-import-010.xht == reference/ref-this-text-should-be-green.xht
+at-import-011.xht == reference/ref-this-text-should-be-green.xht
+at-keywords-000.xht == reference/ref-this-text-should-be-green.xht
+at-keywords-001.xht == reference/ref-this-text-should-be-green.xht
+at-keywords-002.xht == reference/ref-this-text-should-be-green.xht
 at-rule-001.xht == reference/filler-text-below-green.xht
 at-rule-002.xht == reference/filler-text-below-green.xht
 at-rule-003.xht == reference/filler-text-below-green.xht
@@ -485,8 +536,15 @@ at-rule-009.xht == reference/filler-text-below-green.xht
 at-rule-010.xht == reference/filler-text-below-green.xht
 at-rule-011.xht == reference/filler-text-below-green.xht
 at-rule-012.xht == reference/filler-text-below-green.xht
+at-rule-013.xht == reference/at-rule-013-ref.xht
+at-rules-000.xht == reference/ref-this-text-should-be-green.xht
+at-rules-001.xht == reference/ref-this-text-should-be-green.xht
+at-rules-002.xht == reference/ref-this-text-should-be-green.xht
+at-rules-003.xht == reference/ref-this-text-should-be-green.xht
+at-rules-004.xht == reference/ref-this-text-should-be-green.xht
 attribute-selector-001.xht == reference/no-red-filler-text-ref.xht
 attribute-selector-002.xht == reference/filler-text-below-green.xht
+attribute-token-selector-002.xht == reference/attribute-token-selector-002-ref.xht
 attribute-value-selector-004.xht == reference/no-red-filler-text-ref.xht
 attribute-value-selector-005.xht == reference/filler-text-below-green.xht
 attribute-value-selector-006.xht == reference/filler-text-below-green.xht
@@ -1013,6 +1071,7 @@ before-content-display-018.xht == reference/after-content-display-001-ref.xht
 bidi-001.xht == reference/bidi-001-ref.xht
 bidi-002.xht == reference/bidi-002-ref.xht
 bidi-003.xht == reference/bidi-003-ref.xht
+bidi-004.xht == reference/bidi-004-ref.xht
 bidi-005a.xht == reference/bidi-005a-ref.xht
 bidi-005b.xht == reference/bidi-005b-ref.xht
 bidi-006a.xht == reference/bidi-005a-ref.xht
@@ -1180,6 +1239,7 @@ block-replaced-height-006.xht == reference/block-replaced-height-006-ref.xht
 block-replaced-height-007.xht == reference/block-replaced-height-004-ref.xht
 block-replaced-width-002.xht == reference/block-replaced-width-002-ref.xht
 block-replaced-width-006.xht == reference/block-replaced-width-006-ref.xht
+blocks-001.xht == reference/blocks-001-ref.xht
 blocks-002.xht == reference/filler-text-below-green.xht
 blocks-003.xht == reference/filler-text-below-green.xht
 blocks-004.xht == reference/no-red-filler-text-ref.xht
@@ -2471,6 +2531,7 @@ c541-word-sp-001.xht == reference/c541-word-sp-001-ref.xht
 c542-letter-sp-000.xht == reference/c542-letter-sp-000-ref.xht
 c542-letter-sp-001.xht == reference/c542-letter-sp-001-ref.xht
 c544-valgn-001.xht == reference/c544-valgn-001-ref.xht
+c547-indent-000.xht == reference/c547-indent-000-ref.xht
 c547-indent-001.xht == reference/c547-indent-001-ref.xht
 c548-leadin-000.xht == reference/c548-leadin-000-ref.xht
 c548-ln-ht-000.xht == reference/c548-ln-ht-000-ref.xht
@@ -2533,6 +2594,7 @@ c5509-padn-l-001.xht == reference/c5509-padn-l-001-ref.xht
 c5509-padn-l-002.xht == reference/c5509-padn-l-002-ref.xht
 c5509-padn-l-003.xht == reference/c5509-padn-l-003-ref.xht
 c5510-ipadn-000.xht == reference/c5510-ipadn-000-ref.xht
+c5510-padn-000.xht == reference/c5510-padn-000-ref.xht
 c5510-padn-001.xht == reference/c5510-padn-001-ref.xht
 c5510-padn-002.xht == reference/c5510-padn-002-ref.xht
 c5511-brdr-tw-001.xht == reference/c5511-brdr-tw-001-ref.xht
@@ -2585,6 +2647,20 @@ cascade-009.xht == reference/filler-text-below-green.xht
 cascade-009a.xht == reference/cascade-009a-ref.xht
 cascade-009b.xht == reference/cascade-009b-ref.xht
 cascade-012.xht == reference/cascade-012-ref.xht
+cascade-import-dynamic-001.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-002.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-003.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-004.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-005.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-006.xht == reference/ref-this-text-should-be-green.xht
+cascade-import-dynamic-control.xht == reference/ref-this-text-should-be-green.xht
+case-sensitive-000.xht == reference/ref-green-background.xht
+case-sensitive-001.xht == reference/ref-green-background.xht
+case-sensitive-003.xht == reference/case-sensitive-003-ref.xht
+case-sensitive-004.xht == reference/case-sensitive-003-ref.xht
+case-sensitive-005.xht == reference/case-sensitive-005-ref.xht
+case-sensitive-006.xht == reference/filler-text-below-green.xht
+case-sensitive-007.xht == reference/no-red-filler-text-ref.xht
 charset-attr-001.xht == reference/at-charset-ref.xht
 class-selector-001.xht == reference/no-red-filler-text-ref.xht
 class-selector-002.xht == reference/filler-text-below-green.xht
@@ -2679,6 +2755,7 @@ clip-099.xht == reference/no-red-on-blank-page-ref.xht
 clip-102.xht == reference/no-red-on-blank-page-ref.xht
 collapsing-border-model-010a.xht == reference/ref-filled-green-100px-square.xht
 collapsing-border-model-010b.xht == reference/ref-filled-green-100px-square.xht
+color-000.xht == reference/color-000-ref.xht
 color-001.xht == reference/color-001-ref.xht
 color-002.xht == reference/color-002-ref.xht
 color-003.xht == reference/color-003-ref.xht
@@ -2846,6 +2923,7 @@ colors-002.xht == reference/no-red-filler-text-ref.xht
 colors-003.xht == reference/no-red-filler-text-ref.xht
 colors-004.xht == reference/no-red-filler-text-ref.xht
 colors-005.xht == reference/filler-text-below-green.xht
+colors-006.xht == reference/colors-006-ref.xht
 colors-007.xht == reference/colors-007-ref.xht
 column-visibility-004.xht == reference/column-visibility-004-ref.xht
 combinator-001.xht == reference/filler-text-below-green.xht
@@ -2889,12 +2967,53 @@ content-173.xht == reference/content-173-ref.xht
 content-174.xht == reference/content-174-ref.xht
 content-175.xht == reference/content-175-ref.xht
 content-177.xht == reference/content-177-ref.xht
+content-counter-000.xht == reference/content-counter-000-ref.xht
+content-counter-001.xht == reference/content-counter-001-ref.xht
+content-counter-002.xht == reference/content-counter-002-ref.xht
+content-counter-003.xht == reference/content-counter-003-ref.xht
+content-counter-004.xht == reference/content-counter-004-ref.xht
+content-counter-005.xht == reference/content-counter-000-ref.xht
+content-counter-006.xht == reference/content-counter-006-ref.xht
+content-counter-007.xht == reference/content-counter-007-ref.xht
+content-counter-008.xht == reference/content-counter-008-ref.xht
+content-counter-009.xht == reference/content-counter-009-ref.xht
+content-counter-010.xht == reference/content-counter-010-ref.xht
+content-counter-011.xht == reference/content-counter-011-ref.xht
+content-counter-012.xht == reference/content-counter-011-ref.xht
+content-counter-013.xht == reference/content-counter-013-ref.xht
+content-counter-014.xht == reference/content-counter-013-ref.xht
+content-counter-015.xht == reference/content-counter-015-ref.xht
+content-counter-016.xht == reference/content-counter-000-ref.xht
 content-inherit-002.xht == reference/content-inherit-002-ref.xht
 content-type-000.xht == reference/content-type-000-ref.xht
 content-type-001.xht == reference/content-type-000-ref.xht
+core-syntax-001.xht == reference/core-syntax-001-ref.xht
+core-syntax-002.xht == reference/core-syntax-002-ref.xht
+core-syntax-003.xht == reference/ref-this-text-should-be-green.xht
+core-syntax-004.xht == reference/ref-this-text-should-be-green.xht
+core-syntax-006.xht == reference/core-syntax-006-ref.xht
+core-syntax-007.xht == reference/core-syntax-007-ref.xht
+core-syntax-008.xht == reference/ref-this-text-should-be-green.xht
+core-syntax-009.xht == reference/ref-this-text-should-be-green.xht
 counter-reset-increment-002.xht == reference/counter-reset-increment-002-ref.xht
+counters-001.xht == reference/counters-001-ref.xht
 counters-002.xht == reference/no-red-filler-text-ref.xht
+counters-003.xht == reference/counters-003-ref.xht
+counters-004.xht == reference/counters-004-ref.xht
+counters-005.xht == reference/counters-003-ref.xht
+counters-006.xht == reference/counters-004-ref.xht
+counters-007.xht == reference/counters-003-ref.xht
+counters-008.xht == reference/counters-004-ref.xht
+counters-009.xht == reference/counters-003-ref.xht
+counters-010.xht == reference/counters-010-ref.xht
+declaration-001.xht == reference/ref-this-text-should-be-green.xht
+declaration-002.xht == reference/ref-this-text-should-be-green.xht
+declaration-003.xht == reference/ref-this-text-should-be-green.xht
+declaration-004.xht == reference/ref-this-text-should-be-green.xht
+declaration-005.xht == reference/ref-this-text-should-be-green.xht
+declaration-006.xht == reference/ref-this-text-should-be-green.xht
 declaration-whitespace-001.xht == reference/filler-text-below-green.xht
+declarations-009.xht == reference/declarations-009-ref.xht
 default-attribute-selector-001.xht == reference/ref-filled-green-100px-square.xht
 default-attribute-selector-002.xht == reference/ref-filled-green-100px-square.xht
 default-attribute-selector-003.xht == reference/ref-filled-green-100px-square.xht
@@ -2982,6 +3101,22 @@ escaped-ident-spaces-004.xht == reference/filler-text-below-green.xht
 escaped-ident-spaces-005.xht == reference/filler-text-below-green.xht
 escaped-ident-spaces-006.xht == reference/filler-text-below-green.xht
 escaped-ident-spaces-007.xht == reference/filler-text-below-green.xht
+escaped-newline-001.xht == reference/escaped-newline-001-ref.xht
+escapes-000.xht == reference/escapes-000-ref.xht
+escapes-001.xht == reference/ref-green-background.xht
+escapes-002.xht == reference/ref-green-background.xht
+escapes-003.xht == reference/ref-green-background.xht
+escapes-004.xht == reference/ref-green-background.xht
+escapes-005.xht == reference/ref-green-background.xht
+escapes-006.xht == reference/ref-green-background.xht
+escapes-007.xht == reference/ref-green-background.xht
+escapes-008.xht == reference/ref-green-background.xht
+escapes-009.xht == reference/ref-this-text-should-be-green.xht
+escapes-010.xht == reference/ref-this-text-should-be-green.xht
+escapes-011.xht == reference/ref-this-text-should-be-green.xht
+escapes-012.xht == reference/ref-this-text-should-be-green.xht
+escapes-013.xht == reference/escapes-013-ref.xht
+escapes-014.xht == reference/ref-green-background.xht
 escapes-015.xht == reference/ref-if-there-is-no-red.xht
 escapes-016.xht == reference/ref-if-there-is-no-red.xht
 extract-ordered-lists-in-regions-explicit-counters-002.xht == reference/extract-ordered-lists-in-regions-explicit-counters-002-ref.xht
@@ -3282,6 +3417,10 @@ font-family-applies-to-016.xht == reference/ref-if-there-is-no-red.xht
 font-family-applies-to-017.xht == reference/font-family-applies-to-001-ref.xht
 font-family-invalid-characters-001.xht == reference/font-family-invalid-characters-001-ref.xht
 font-family-invalid-characters-002.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-003.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-004.xht == reference/font-family-invalid-characters-002-ref.xht
+font-family-invalid-characters-005.xht == reference/font-family-invalid-characters-005-ref.xht
+font-family-invalid-characters-006.xht == reference/font-family-invalid-characters-006-ref.xht
 font-family-name-001.xht == reference/font-family-name-ref.xht
 font-family-name-002.xht == reference/font-family-name-ref.xht
 font-family-name-003.xht == reference/font-family-name-ref.xht
@@ -3500,12 +3639,27 @@ id-selector-001.xht == reference/filler-text-below-green.xht
 id-selector-004.xht == reference/no-red-filler-text-ref.xht
 id-selector-005.xht == reference/no-red-filler-text-ref.xht
 id-selector-006.xht == reference/filler-text-below-green.xht
+ident-000.xht == reference/ident-000-ref.xht
+ident-001.xht == reference/ident-000-ref.xht
+ident-002.xht == reference/ident-000-ref.xht
+ident-003.xht == reference/ident-000-ref.xht
+ident-004.xht == reference/ident-000-ref.xht
+ident-005.xht == reference/ident-000-ref.xht
+ident-006.xht == reference/ident-000-ref.xht
+ident-007.xht == reference/ident-000-ref.xht
+ident-008.xht == reference/ident-000-ref.xht
+ident-009.xht == reference/ident-000-ref.xht
+ident-010.xht == reference/ident-000-ref.xht
+ident-011.xht == reference/ident-000-ref.xht
+ident-012.xht == reference/ident-012-ref.xht
+ident-013.xht == reference/ident-000-ref.xht
 ident-014.xht == reference/filler-text-below-green.xht
 ident-015.xht == reference/filler-text-below-green.xht
 ident-016.xht == reference/filler-text-below-green.xht
 ident-017.xht == reference/no-red-filler-text-ref.xht
 ident-018.xht == reference/no-red-filler-text-ref.xht
 ident-019.xht == reference/filler-text-below-green.xht
+ident-020.xht == reference/ident-000-ref.xht
 ignored-rules-001.xht == reference/filler-text-below-green.xht
 ignored-rules-002.xht == reference/filler-text-below-green.xht
 ignored-rules-003.xht == reference/filler-text-below-green.xht
@@ -3513,6 +3667,8 @@ ignored-rules-004.xht == reference/filler-text-below-green.xht
 ignored-rules-005.xht == reference/filler-text-below-green.xht
 ignored-rules-006.xht == reference/filler-text-below-green.xht
 ignored-rules-007.xht == reference/filler-text-below-green.xht
+import-000.xht == reference/ref-this-text-should-be-green.xht
+import-001.xht == reference/ref-this-text-should-be-green.xht
 inherit-static-offset-001.xht == reference/ref-filled-green-100px-square.xht
 inherit-static-offset-002.xht == reference/ref-filled-green-100px-square.xht
 inherit-static-offset-003.xht == reference/ref-filled-green-100px-square.xht
@@ -3661,6 +3817,8 @@ insert-inline-in-blocks-n-inlines-middle-003.xht == reference/insert-inline-in-b
 invalid-at-rule-001.xht == reference/no-red-filler-text-ref.xht
 invalid-decl-at-rule-001.xht == reference/filler-text-below-green.xht
 invalid-decl-at-rule-002.xht == reference/filler-text-below-green.xht
+keywords-000.xht == reference/ref-green-background.xht
+keywords-001.xht == reference/keywords-001-ref.xht
 lang-selector-002.xht == reference/no-red-filler-text-ref.xht
 lang-selector-003.xht == reference/filler-text-below-green.xht
 leading-001.xht == reference/leading-001-ref.xht
@@ -3814,6 +3972,7 @@ line-height-applies-to-016.xht == reference/line-height-applies-to-016-ref.xht
 line-height-bleed-001.xht == reference/line-height-bleed-001-ref.xht
 line-height-bleed-002.xht == reference/line-height-bleed-002-ref.xht
 list-style-019.xht == reference/list-style-019-ref.xht
+list-style-020.xht == reference/list-style-020-ref.xht
 list-style-021.xht == reference/list-style-021-ref.xht
 list-style-image-004.xht == reference/list-style-image-004-ref.xht
 list-style-image-005.xht == reference/list-style-image-005-ref.xht
@@ -4191,6 +4350,9 @@ margin-top-applies-to-012.xht == reference/margin-top-applies-to-012-ref.xht
 margin-top-applies-to-013.xht == reference/margin-top-applies-to-013-ref.xht
 margin-top-applies-to-014.xht == reference/margin-top-applies-to-013-ref.xht
 margin-top-applies-to-015.xht == reference/margin-top-applies-to-013-ref.xht
+matching-brackets-001.xht == reference/matching-brackets-001-ref.xht
+matching-brackets-002.xht == reference/matching-brackets-002-ref.xht
+matching-brackets-003.xht == reference/matching-brackets-001-ref.xht
 max-height-001.xht == reference/ref-filled-black-96px-square.xht
 max-height-002.xht == reference/height-001-ref.xht
 max-height-003.xht == reference/height-003-ref.xht
@@ -4575,9 +4737,22 @@ moz-multicol3-column-balancing-break-inside-avoid-1.xht == reference/moz-multico
 multicol-height-002.xht == reference/multicol-height-002.xht
 numbers-units-001.xht == reference/no-red-on-blank-page-ref.xht
 numbers-units-003.xht == reference/no-red-on-blank-page-ref.xht
+numbers-units-004.xht == reference/ref-filled-black-96px-square.xht
 numbers-units-005.xht == reference/no-red-on-blank-page-ref.xht
+numbers-units-006.xht == reference/ref-filled-black-96px-square.xht
+numbers-units-007.xht == reference/numbers-units-007-ref.xht
+numbers-units-009.xht == reference/numbers-units-009-ref.xht
+numbers-units-010.xht == reference/numbers-units-010-ref.xht
+numbers-units-011.xht == reference/numbers-units-011-ref.xht
+numbers-units-012.xht == reference/numbers-units-012-ref.xht
+numbers-units-013.xht == reference/numbers-units-013-ref.xht
+numbers-units-015.xht == reference/numbers-units-014-ref-a.xht
+numbers-units-015.xht == reference/numbers-units-014-ref-b.xht
 numbers-units-016.xht == reference/no-red-on-blank-page-ref.xht
 numbers-units-017.xht == reference/no-red-on-blank-page-ref.xht
+numbers-units-018.xht == reference/numbers-units-018-ref.xht
+numbers-units-019.xht == reference/numbers-units-019-ref.xht
+numbers-units-021.xht == reference/numbers-units-021-ref.xht
 other-attribute-001.xht == reference/no-red-on-blank-page-ref.xht
 outline-applies-to-005.xht == reference/no-red-on-blank-page-ref.xht
 outline-applies-to-006.xht == reference/no-red-on-blank-page-ref.xht
@@ -5047,6 +5222,10 @@ pseudo-015.xht == reference/no-red-filler-text-ref.xht
 pseudo-016.xht == reference/no-red-filler-text-ref.xht
 quoted-keywords-001.xht == reference/no-red-filler-text-ref.xht
 quoted-keywords-002.xht == reference/no-red-filler-text-ref.xht
+quoted-string-001.xht == reference/quoted-string-001-ref.xht
+quoted-string-002.xht == reference/quoted-string-002-ref.xht
+quoted-string-003.xht == reference/quoted-string-001-ref.xht
+quoted-string-004.xht == reference/quoted-string-002-ref.xht
 quotes-035.xht == reference/quotes-035-ref.xht
 quotes-035a.xht == reference/quotes-035-ref.xht
 quotes-036.xht == reference/quotes-035-ref.xht
@@ -5263,6 +5442,7 @@ run-in-text-between-002.xht == reference/run-in-text-ref.xht
 run-in-text-between-003.xht == reference/run-in-text-ref.xht
 run-in-text-between-004.xht == reference/run-in-basic-ref.xht
 run-in-text-between-005.xht == reference/run-in-basic-ref.xht
+selectors-parsing-001.xht == reference/selectors-parsing-001-ref.xht
 separated-border-model-003a.xht == reference/ref-filled-green-100px-square.xht
 separated-border-model-003b.xht == reference/separated-border-model-003b-ref.xht
 separated-border-model-004a.xht == reference/ref-filled-green-100px-square.xht
@@ -5273,7 +5453,9 @@ separated-border-model-004e.xht == reference/separated-border-model-004e-ref.xht
 separated-border-model-007.xht == reference/separated-border-model-007-ref.xht
 separated-border-model-008.xht == reference/separated-border-model-007-ref.xht
 separated-border-model-009.xht == reference/separated-border-model-007-ref.xht
+sgml-comments-000.xht == reference/ref-this-text-should-be-green.xht
 sgml-comments-001.xht == reference/filler-text-below-green.xht
+sgml-comments-002.xht == reference/sgml-comments-002-ref.xht
 shand-border-000.xht == reference/shand-border-000-ref.xht
 shand-border-001.xht == reference/ref-if-there-is-no-red.xht
 shand-font-000.xht == reference/shand-font-000-ref.xht
@@ -5296,6 +5478,7 @@ stack-floats-001.xht == reference/stack-floats-001-ref.xht
 stack-floats-002.xht == reference/stack-floats-001-ref.xht
 stack-floats-003.xht == reference/stack-floats-001-ref.xht
 stack-floats-004.xht == reference/stack-floats-001-ref.xht
+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
@@ -5458,21 +5641,31 @@ units-001.xht == reference/units-001-ref.xht
 units-002.xht == reference/units-002-ref.xht
 units-003.xht == reference/units-003-ref.xht
 units-004.xht == reference/units-004-ref.xht
+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-003.xht == reference/filler-text-below-green.xht
 universal-selector-004.xht == reference/filler-text-below-green.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
 uri-003.xht == reference/no-red-filler-text-ref.xht
+uri-004.xht == reference/ref-green-background.xht
+uri-005.xht == reference/ref-green-background.xht
 uri-006.xht == reference/no-red-filler-text-ref.xht
 uri-007.xht == reference/no-red-filler-text-ref.xht
 uri-008.xht == reference/no-red-filler-text-ref.xht
 uri-009.xht == reference/no-red-filler-text-ref.xht
 uri-010.xht == reference/no-red-filler-text-ref.xht
 uri-011.xht == reference/no-red-filler-text-ref.xht
+uri-012.xht == reference/uri-012-ref.xht
 uri-013.xht == reference/uri-013-ref.xht
+uri-014.xht == reference/ref-green-background.xht
+uri-015.xht == reference/ref-green-background.xht
+uri-016.xht == reference/uri-016-ref.xht
+uri-017.xht == reference/uri-017-ref.xht
+uri-018.xht == reference/ref-this-text-should-be-green.xht
 vertical-align-004.xht == reference/vertical-align-004-ref.xht
 vertical-align-005.xht == reference/vertical-align-004-ref.xht
 vertical-align-006.xht == reference/vertical-align-004-ref.xht
@@ -5576,6 +5769,8 @@ white-space-pre-002.xht == reference/white-space-pre-002-ref.xht
 white-space-pre-005.xht == reference/white-space-normal-005-ref.xht
 white-space-pre-006.xht == reference/white-space-normal-005-ref.xht
 white-space-processing-049.xht == reference/white-space-processing-049-ref.xht
+whitespace-001.xht == reference/no-red-filler-text-ref.xht
+whitespace-002.xht == reference/no-red-filler-text-ref.xht
 width-001.xht == reference/ref-if-there-is-no-red.xht
 width-002.xht == reference/ref-if-there-is-no-red.xht
 width-003.xht == reference/max-width-003-ref.xht
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/selectors-parsing-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/selectors-parsing-001.xht
index 7f2e95dd18f..2a59469b017 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/selectors-parsing-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/selectors-parsing-001.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/parsing/001.xml" type="application/xhtml+xml"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/selectors-parsing-001-ref.xht"/>
   <style type="text/css">
    p { background: white; color: green; }
    p:invalidPseudoClass, p.test1 { color: yellow; background: red; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-000.xht
index 5e6426542c3..b652f06db53 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-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/syndata.html#comments"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="UAs must ignore SGML comment delimiters between statements."/>
 <style type="text/css"><![CDATA[
@@ -24,7 +25,7 @@ p {color: green}
  </head>
  <body>
 
-<p>This text should be green, not red.</p>
+<p>This text should be green.</p>
 
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-002.xht
index ca60bac3583..e94244c368f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/sgml-comments-002.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/cdocdc/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#comments" />
+  <link rel="match" href="reference/sgml-comments-002-ref.xht" />
   <style type="text/css"><![CDATA[
     <!--
     .a { color: green; } -->
@@ -23,8 +24,8 @@
   ]]></style>
  </head>
  <body>
-  <p class="a">This line should be green.</p>
-  <p class="b">This line should be green.</p>
-  <p class="c">This line should be green.</p>
+  <p class="a">This text should be green.</p>
+  <p class="b">This text should be green.</p>
+  <p class="c">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/strings-000.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/strings-000.xht
index 303d24107d6..68ad4628afd 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/strings-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/strings-000.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#strings"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
     p { color: red }
     p[title="this is\
@@ -20,6 +21,6 @@
   </style>
  </head>
  <body>
-  <p title="this is a test">This should be green</p>
+  <p title="this is a test">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht
index 463551ff295..1654398202f 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/toc.xht
@@ -37,7 +37,7 @@
     <tbody id="s4">
       <tr><th><a href="chapter-4.xht">Chapter 4 - 
         Syntax and basic data types</a></th>
-      <td>(439 Tests)</td></tr>
+      <td>(438 Tests)</td></tr>
     </tbody>
     <tbody id="s5">
       <tr><th><a href="chapter-5.xht">Chapter 5 - 
@@ -57,17 +57,17 @@
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
         Box model</a></th>
-      <td>(2326 Tests)</td></tr>
+      <td>(2327 Tests)</td></tr>
     </tbody>
     <tbody id="s9">
       <tr><th><a href="chapter-9.xht">Chapter 9 - 
         Visual formatting model</a></th>
-      <td>(1245 Tests)</td></tr>
+      <td>(1246 Tests)</td></tr>
     </tbody>
     <tbody id="s10">
       <tr><th><a href="chapter-10.xht">Chapter 10 - 
         Visual formatting model details</a></th>
-      <td>(1481 Tests)</td></tr>
+      <td>(1449 Tests)</td></tr>
     </tbody>
     <tbody id="s11">
       <tr><th><a href="chapter-11.xht">Chapter 11 - 
@@ -97,7 +97,7 @@
     <tbody id="s16">
       <tr><th><a href="chapter-16.xht">Chapter 16 - 
         Text</a></th>
-      <td>(608 Tests)</td></tr>
+      <td>(609 Tests)</td></tr>
     </tbody>
     <tbody id="s17">
       <tr><th><a href="chapter-17.xht">Chapter 17 - 
@@ -107,7 +107,7 @@
     <tbody id="s18">
       <tr><th><a href="chapter-18.xht">Chapter 18 - 
         User interface</a></th>
-      <td>(360 Tests)</td></tr>
+      <td>(361 Tests)</td></tr>
     </tbody>
     <tbody id="sA">
       <tr><th><a href="chapter-A.xht">Appendix A - 
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/units-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/units-005.xht
index e2556c8292c..6f6093cb961 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/units-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/units-005.xht
@@ -14,6 +14,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/units/005.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#length-units" />
+  <link rel="match" href="reference/units-005-ref.xht" />
 
   <style type="text/css">
    div { width: 8.7em; height: 8.7em; background: red; border: solid lime; }
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/unterminated-string-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/unterminated-string-001.xht
index a49f24eddc5..eef914579f4 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/unterminated-string-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/unterminated-string-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/syndata.html#parsing-errors" />
+        <link rel="match" href="reference/filler-text-below-green.xht" />
         <meta name="flags" content="invalid" />
         <meta name="assert" content="When the parser encounters an unterminated string, the parser drops everything up to the next ';'." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-004.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-004.xht
index 85510553fb9..7452995cbe9 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-004.xht
@@ -13,17 +13,18 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri" />
+        <link rel="match" href="reference/ref-green-background.xht" />
         <meta name="flags" content="image" />
         <meta name="assert" content="URI escapes are allowed in URL functions." />
         <style type="text/css">
-            div
+            p
             {
+                color: white;
                 background: red url(support/%27green%20block.png);
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the box below is green.</p>
-        <div>Filler Text</div>
+        <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/uri-005.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-005.xht
index f8a3abc4a1a..5dfc42757a5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-005.xht
@@ -13,17 +13,18 @@
 </style>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri" />
+        <link rel="match" href="reference/ref-green-background.xht" />
         <meta name="flags" content="image" />
         <meta name="assert" content="Single quote characters appearing in an unquoted URI need to be escaped with a backslash so that the resulting URI value is a URI token." />
         <style type="text/css">
-            div
+            p
             {
+                color: white;
                 background: red url(support/\'green\ block.png);
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the box below is green.</p>
-        <div>Filler Text</div>
+        <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/uri-012.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-012.xht
index a9d81961c3b..4cd2a865f57 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-012.xht
@@ -15,6 +15,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/uri/010.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri" />
+  <link rel="match" href="reference/uri-012-ref.xht" />
   <meta name="flags" content="invalid" />
   <style>
    .control {
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-014.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-014.xht
index 07d23fb993f..6d49f6b1de3 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-014.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Unquoted commas inside url() are valid."/>
   <style type="text/css"><![CDATA[
@@ -24,6 +25,6 @@
   ]]></style>
  </head>
  <body>
-  <p>This sentence must have a green background.</p>
+  <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/uri-015.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-015.xht
index db25d4a87b4..7c88691fb3b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-015.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-015.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri"/>
+  <link rel="match" href="reference/ref-green-background.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="url() notation is case-insensitive and can be escaped."/>
   <style type="text/css"><![CDATA[
@@ -24,6 +25,6 @@
   ]]></style>
  </head>
  <body>
-  <p>This sentence must have a green background.</p>
+  <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/uri-016.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-016.xht
index 37ba55b3f13..a3ed80b02c5 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-016.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-016.xht
@@ -15,6 +15,7 @@
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/parsing/uri/007.html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#uri"/>
+  <link rel="match" href="reference/uri-016-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Comments are just regular tokens inside      unquoted URLs."/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-017.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-017.xht
index 917a6bd24ea..389a3efd08d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-017.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-017.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Bert Bos" href="mailto:bert@w3.org"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/uri-017-ref.xht"/>
   <meta name="flags" content="invalid image"/>
   <meta name="assert" content="User agents must close open URI constructs and style rules at the end of the style sheet."/>
   <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-018.xht
index d362f32729e..063200413ac 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/uri-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/uri-018.xht
@@ -13,6 +13,7 @@
 </style>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#parsing-errors"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <meta name="flags" content="invalid image"/>
   <meta name="assert" content="User agents must close open URI constructs and statements at the end of the style sheet."/>
   <style type="text/css">
@@ -20,6 +21,6 @@
     p { color: red; }
  </head>
  <body>
-  <p class="import">This sentence must be green.</p>
+  <p class="import">This text should be green.</p>
  </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-002a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-002a.xht
deleted file mode 100644
index dc612c7a199..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-002a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'baseline' (alphabetical baseline 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 vertical-alignment-002a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-002b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-002b.xht
deleted file mode 100644
index 3eef0fb3838..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-002b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'baseline' (alphabetical baseline 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 vertical-alignment-002b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-003a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-003a.xht
deleted file mode 100644
index e8738349d87..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-003a.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'baseline' (central baseline 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 vertical-alignment-003a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-003b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-003b.xht
deleted file mode 100644
index 0b636f3a383..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-003b.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'baseline' (central baseline 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 vertical-alignment-003b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: baseline;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-005a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-005a.xht
deleted file mode 100644
index 8ba7c23d942..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-005a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'sub' (alphabetical baseline 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 vertical-alignment-005a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-005b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-005b.xht
deleted file mode 100644
index 70702e53254..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-005b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'sub' (alphabetical baseline 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 vertical-alignment-005b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: sub;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sub>LLLLLLLLLLLLL</sub>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-008a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-008a.xht
deleted file mode 100644
index dcf6fce1aef..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-008a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'super' (alphabetical baseline 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 vertical-alignment-008a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-008b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-008b.xht
deleted file mode 100644
index cc396c98436..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-008b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'super' (alphabetical baseline 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 vertical-alignment-008b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: super;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">X<sup>LLLLLLLLLLLLL</sup>
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-011a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-011a.xht
deleted file mode 100644
index 9b74dc2118d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-011a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero length (0em)' (alphabetical baseline 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 vertical-alignment-011a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-011b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-011b.xht
deleted file mode 100644
index be503c13ef0..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-011b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero length (0em)' (alphabetical baseline 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 vertical-alignment-011b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-012l.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-012l.xht
deleted file mode 100644
index c86c2cb64b7..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-012l.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero length (0em)' (central baseline 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 vertical-alignment-012l"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-012r.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-012r.xht
deleted file mode 100644
index 398ab6cc76d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-012r.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero length (0em)' (central baseline 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 vertical-alignment-012r"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-014a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-014a.xht
deleted file mode 100644
index 92f126c80b2..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-014a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline 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 vertical-alignment-014a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-014b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-014b.xht
deleted file mode 100644
index 01567c1a524..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-014b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline 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 vertical-alignment-014b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.8em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-015a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-015a.xht
deleted file mode 100644
index 1d331ba7120..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-015a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive length (0.5em)' (central baseline 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 vertical-alignment-015a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-015b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-015b.xht
deleted file mode 100644
index 46a41ea54b2..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-015b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive length (0.5em)' (central baseline 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 vertical-alignment-015b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-017a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-017a.xht
deleted file mode 100644
index ba71a004889..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-017a.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline 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 vertical-alignment-017a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-017b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-017b.xht
deleted file mode 100644
index 90196941fc1..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-017b.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative length (-0.2em)' (alphabetical baseline 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 vertical-alignment-017b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.2em;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-018a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-018a.xht
deleted file mode 100644
index dc85147f4b3..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-018a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative length (-0.5em)' (central baseline 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 vertical-alignment-018a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-018b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-018b.xht
deleted file mode 100644
index d2552a58cda..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-018b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative length (-0.5em)' (central baseline 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 vertical-alignment-018b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -0.5em;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-020a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-020a.xht
deleted file mode 100644
index 9346e3c4e29..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-020a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline 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 vertical-alignment-020a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-020b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-020b.xht
deleted file mode 100644
index 6b6a846d985..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-020b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'zero percentage (0%)' (alphabetical baseline 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 vertical-alignment-020b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font-size: 2em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the bottom of glyph 'L' is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">LLLLLLLLLLLL
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-021a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-021a.xht
deleted file mode 100644
index f3fea1cb4b4..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-021a.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero percentage (0%)' (central baseline 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 vertical-alignment-021a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-021b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-021b.xht
deleted file mode 100644
index 13a48bfee8b..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-021b.xht
+++ /dev/null
@@ -1,79 +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: vertical align - 'zero percentage (0%)' (central baseline 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 vertical-alignment-021b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 0%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-
-      /* font-size */
-      .half {
-        vertical-align: text-top;
-        font-size: 0.5em;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation"><span class="half">LLLLLLLLL</span>
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-023a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-023a.xht
deleted file mode 100644
index 770a99acb0e..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-023a.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive length (0.8em)' (alphabetical baseline 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 vertical-alignment-023a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-023b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-023b.xht
deleted file mode 100644
index a1db3521a3e..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-023b.xht
+++ /dev/null
@@ -1,76 +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: vertical align - 'positive percentage (80%)' (alphabetical baseline 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 vertical-alignment-023b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 80%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-024a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-024a.xht
deleted file mode 100644
index 0336758eb2d..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-024a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive percentage (50%)' (central baseline 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 vertical-alignment-024a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-024b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-024b.xht
deleted file mode 100644
index 95368fb13d8..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-024b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'positive percentage (50%)' (central baseline 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 vertical-alignment-024b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: 50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-026a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-026a.xht
deleted file mode 100644
index e3bd0a95fac..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-026a.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative percentage (-20%)' (alphabetical baseline 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 vertical-alignment-026a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        padding-right: 0.2em;
-        margin-top: 1em;
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-left {
-        text-orientation: sideways-left;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>right</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>right</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-rl">
-      <p class="sideways-left">SIDEL
-        <img class="square" src="./support/yellow-square-vert-redline-right-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-026b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-026b.xht
deleted file mode 100644
index 8b8eb79d003..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-026b.xht
+++ /dev/null
@@ -1,77 +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: vertical align - 'negative length (-20%)' (alphabetical baseline 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 vertical-alignment-026b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'sideways-left', 'sideways-right' or 'sideways', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        margin-top: 1em;
-        padding-left: 0.2em;
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -20%;
-      }
-      img.line {
-        margin-top: -230px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .sideways-right {
-        text-orientation: sideways-right;
-      }
-      .sideways {
-        text-orientation: sideways;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>left</strong> edge of yellow square is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="sideways">SIDEW
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-    <div class="vertical-lr">
-      <p class="sideways-right">SIDER
-        <img class="square" src="./support/yellow-square-vert-redline-left-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-027a.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-027a.xht
deleted file mode 100644
index e94e0a0e359..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-027a.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative percentage (-50%)' (central baseline 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 vertical-alignment-027a"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-lr {
-        writing-mode: vertical-lr;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-lr">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-027b.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-027b.xht
deleted file mode 100644
index 988383f12c2..00000000000
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/vertical-alignment-027b.xht
+++ /dev/null
@@ -1,73 +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: vertical align - 'negative percentage (-50%)' (central baseline 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 vertical-alignment-027b"; }
-            @bottom-right { content: counter(page); }
-          }
-</style>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="help" title="4.4. Baseline Alignment" href="http://www.w3.org/TR/css-writing-modes-3/#baseline-alignment" />
-    <link rel="help" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" />
-    <meta name="assert" content="This test checks the generation of text baseline with vertical align property. When 'writing-mode' is vertical and when 'text-orientation' is 'mixed', 'upright' or 'use-glyph-orientation', then the central baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem image" />
-    <style type="text/css"><![CDATA[
-      div > p {
-        font: 40px/1 "Ahem";
-        background-color: orange;
-      }
-
-      /* vertical-align */
-      img {
-        vertical-align: -50%;
-      }
-      img.line {
-        margin-top: -260px;
-      }
-
-      /* writing-mode property */
-      .vertical-rl {
-        writing-mode: vertical-rl;
-      }
-
-      /* text-orientation property */
-      .mixed {
-        text-orientation: mixed;
-      }
-      .upright {
-        text-orientation: upright;
-      }
-      .use-glyph-orientation {
-        text-orientation: use-glyph-orientation;
-      }
-  ]]></style>
-  </head>
-  <body>
-    <p>Test passes if ...</p>
-    <ol>
-      <li>the <strong>left</strong> edge of black stripe is touching a thin blue line in each 3 orange rectangles and</li>
-      <li>the <strong>center</strong> of yellow square (showed as a blue line) is aligned to a thin blue line in each 3 orange rectangles and</li>
-      <li>all 3 orange rectangles are <strong>identical</strong>.</li>
-    </ol>
-
-    <div class="vertical-rl">
-      <p class="mixed">MIXED
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="upright">UPRIG
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-      <p class="use-glyph-orientation">USEGL
-        <img class="square" src="./support/yellow-square-vert-redline-center-59x59.png" alt="Image download support must be enabled" />
-        <img class="line" src="./support/blue-vert-line-1x220.png" alt="Image download support must be enabled" />
-      </p>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-001.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-001.xht
index 632b11de98b..a1e1b9d1701 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-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/syndata.html#tokenization" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Em-space is not treated as white space." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-002.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-002.xht
index b626a6db86f..a699365081b 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/whitespace-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/syndata.html#tokenization" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="Ideographic space is not treated as white space." />
         <style type="text/css">
diff --git a/tests/wpt/css-tests/resources/testharnessreport.js b/tests/wpt/css-tests/resources/testharnessreport.js
index 6a79caf753a..79559773f72 100644
--- a/tests/wpt/css-tests/resources/testharnessreport.js
+++ b/tests/wpt/css-tests/resources/testharnessreport.js
@@ -15,16 +15,3 @@ if (window.opener && window.opener.explicit_timeout) {
 }
 
 setup(props);
-add_completion_callback(function() {
-    add_completion_callback(function(tests, status) {
-        var harness_status = {
-            "status": status.status,
-            "message": status.message,
-            "stack": status.stack
-        };
-        var test_results = tests.map(function(x) {
-            return {name:x.name, status:x.status, message:x.message, stack:x.stack}
-        });
-        window.opener.postMessage([test_results, harness_status], "*");
-    })
-});
diff --git a/tests/wpt/css-tests/source_rev b/tests/wpt/css-tests/source_rev
index a538538a7e4..517e86c1da2 100644
--- a/tests/wpt/css-tests/source_rev
+++ b/tests/wpt/css-tests/source_rev
@@ -1 +1 @@
-b7ef4be925f3a4830b804b9d06ec076a39b28043
\ No newline at end of file
+4e5f3c60185fa50fc57c13a725334a33e752cc5d
\ No newline at end of file
diff --git a/tests/wpt/metadata-css/MANIFEST.json b/tests/wpt/metadata-css/MANIFEST.json
index 4f7e260a366..961038bb24b 100644
--- a/tests/wpt/metadata-css/MANIFEST.json
+++ b/tests/wpt/metadata-css/MANIFEST.json
@@ -1,6 +1,15 @@
 {
   "items": {
-    "manual": [],
+    "manual": [
+      {
+        "path": "css-ui-3_dev/html/select-cursor-001-manual.htm",
+        "url": "/css-ui-3_dev/html/select-cursor-001-manual.htm"
+      },
+      {
+        "path": "css21_dev/html4/select-cursor-001-manual.htm",
+        "url": "/css21_dev/html4/select-cursor-001-manual.htm"
+      }
+    ],
     "reftest": [
       {
         "path": "compositing-1_dev/html/will-change-stacking-context-isolation-1.htm",
@@ -27092,6 +27101,46 @@
         ],
         "url": "/css-fonts-3_dev/html/font-family-invalid-characters-002.htm"
       },
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-003.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-003.htm"
+      },
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-004.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-004.htm"
+      },
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-005.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-005.htm"
+      },
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-006.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-006.htm"
+      },
       {
         "path": "css-fonts-3_dev/html/font-family-name-001.htm",
         "references": [
@@ -28442,6 +28491,46 @@
         ],
         "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-002.xht"
       },
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht"
+      },
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht"
+      },
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht"
+      },
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht"
+      },
       {
         "path": "css-fonts-3_dev/xhtml1/font-family-name-001.xht",
         "references": [
@@ -29772,6 +29861,46 @@
         ],
         "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-002.xht"
       },
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht"
+      },
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht"
+      },
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht"
+      },
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht"
+      },
       {
         "path": "css-fonts-3_dev/xhtml1print/font-family-name-001.xht",
         "references": [
@@ -54924,6 +55053,16 @@
         ],
         "url": "/css-style-attr-1_dev/xhtml1print/style-attr-urls-003.xht"
       },
+      {
+        "path": "css-text-3_dev/html/bidi-004.htm",
+        "references": [
+          [
+            "/css-text-3_dev/html/reference/bidi-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-text-3_dev/html/bidi-004.htm"
+      },
       {
         "path": "css-text-3_dev/html/css3-text-line-break-jazh-001.htm",
         "references": [
@@ -115340,6 +115479,16 @@
         ],
         "url": "/css-writing-modes-3_dev/html/bidi-003.htm"
       },
+      {
+        "path": "css-writing-modes-3_dev/html/bidi-004.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/reference/bidi-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/bidi-004.htm"
+      },
       {
         "path": "css-writing-modes-3_dev/html/bidi-011.htm",
         "references": [
@@ -119839,84 +119988,84 @@
         "url": "/css-writing-modes-3_dev/html/unicode-bidi-applies-to-015.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-002.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-002.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-002.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-002.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-003.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-003.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-003.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-003.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-004.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-004.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-004.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-004.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-005.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-005.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-005.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-005.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-006.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-006.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-006.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-006.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-007.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-007.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-007.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-007.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-008.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-008.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-008-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-008.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-008.htm"
       },
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-009.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-009.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-008-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-009.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-009.htm"
       },
       {
         "path": "css-writing-modes-3_dev/html/writing-mode-horizontal-001l.htm",
@@ -126617,84 +126766,84 @@
         "url": "/css-writing-modes-3_dev/xhtml1/unicode-bidi-applies-to-014.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht"
       },
       {
         "path": "css-writing-modes-3_dev/xhtml1/writing-mode-horizontal-001l.xht",
@@ -133385,84 +133534,84 @@
         "url": "/css-writing-modes-3_dev/xhtml1print/unicode-bidi-applies-to-014.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht"
       },
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht"
       },
       {
         "path": "css-writing-modes-3_dev/xhtml1print/writing-mode-horizontal-001l.xht",
@@ -137674,6 +137823,256 @@
         ],
         "url": "/css21_dev/html4/anonymous-table-box-width-001.htm"
       },
+      {
+        "path": "css21_dev/html4/at-charset-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/at-charset-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-008.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-011.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-012.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-014.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-015.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-016.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-016.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-019.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-019.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-020.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-020.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-021.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-021.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-024.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-024.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-025.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-025.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-026.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-026.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-027.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-027.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-028.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-028.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-029.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-029.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-030.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-030.htm"
+      },
       {
         "path": "css21_dev/html4/at-charset-033.htm",
         "references": [
@@ -137734,6 +138133,96 @@
         ],
         "url": "/css21_dev/html4/at-charset-038.htm"
       },
+      {
+        "path": "css21_dev/html4/at-charset-040.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-040.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-041.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-041.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-042.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-042.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-043.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-043.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-044.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-044.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-045.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-045.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-046.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-046.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-047.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-047.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-048.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-048.htm"
+      },
       {
         "path": "css21_dev/html4/at-charset-049.htm",
         "references": [
@@ -137784,6 +138273,16 @@
         ],
         "url": "/css21_dev/html4/at-charset-053.htm"
       },
+      {
+        "path": "css21_dev/html4/at-charset-054.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-054.htm"
+      },
       {
         "path": "css21_dev/html4/at-charset-055.htm",
         "references": [
@@ -137794,6 +138293,16 @@
         ],
         "url": "/css21_dev/html4/at-charset-055.htm"
       },
+      {
+        "path": "css21_dev/html4/at-charset-056.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-056.htm"
+      },
       {
         "path": "css21_dev/html4/at-charset-057.htm",
         "references": [
@@ -137824,6 +138333,96 @@
         ],
         "url": "/css21_dev/html4/at-charset-059.htm"
       },
+      {
+        "path": "css21_dev/html4/at-charset-060.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-060.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-061.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-061.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-071.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-071.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-072.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-072.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-073.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-073.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-074.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-074.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-075.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-075.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-076.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-076.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-charset-077.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-077.htm"
+      },
       {
         "path": "css21_dev/html4/at-charset-quotes-001.htm",
         "references": [
@@ -137974,6 +138573,66 @@
         ],
         "url": "/css21_dev/html4/at-import-007.htm"
       },
+      {
+        "path": "css21_dev/html4/at-import-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-import-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-import-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-import-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-import-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-import-011.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-keywords-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-keywords-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-keywords-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-keywords-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-keywords-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-keywords-002.htm"
+      },
       {
         "path": "css21_dev/html4/at-rule-001.htm",
         "references": [
@@ -138094,6 +138753,66 @@
         ],
         "url": "/css21_dev/html4/at-rule-012.htm"
       },
+      {
+        "path": "css21_dev/html4/at-rule-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/at-rule-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rule-013.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-rules-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-rules-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-rules-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-rules-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/at-rules-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-004.htm"
+      },
       {
         "path": "css21_dev/html4/attribute-selector-001.htm",
         "references": [
@@ -138114,6 +138833,16 @@
         ],
         "url": "/css21_dev/html4/attribute-selector-002.htm"
       },
+      {
+        "path": "css21_dev/html4/attribute-token-selector-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/attribute-token-selector-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/attribute-token-selector-002.htm"
+      },
       {
         "path": "css21_dev/html4/attribute-value-selector-004.htm",
         "references": [
@@ -143326,6 +144055,16 @@
         ],
         "url": "/css21_dev/html4/bidi-003.htm"
       },
+      {
+        "path": "css21_dev/html4/bidi-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/bidi-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/bidi-004.htm"
+      },
       {
         "path": "css21_dev/html4/bidi-005a.htm",
         "references": [
@@ -144976,6 +145715,16 @@
         ],
         "url": "/css21_dev/html4/block-replaced-width-006.htm"
       },
+      {
+        "path": "css21_dev/html4/blocks-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/blocks-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/blocks-001.htm"
+      },
       {
         "path": "css21_dev/html4/blocks-002.htm",
         "references": [
@@ -157862,6 +158611,16 @@
         ],
         "url": "/css21_dev/html4/c544-valgn-001.htm"
       },
+      {
+        "path": "css21_dev/html4/c547-indent-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/c547-indent-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/c547-indent-000.htm"
+      },
       {
         "path": "css21_dev/html4/c547-indent-001.htm",
         "references": [
@@ -158482,6 +159241,16 @@
         ],
         "url": "/css21_dev/html4/c5510-ipadn-000.htm"
       },
+      {
+        "path": "css21_dev/html4/c5510-padn-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/c5510-padn-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/c5510-padn-000.htm"
+      },
       {
         "path": "css21_dev/html4/c5510-padn-001.htm",
         "references": [
@@ -159002,6 +159771,136 @@
         ],
         "url": "/css21_dev/html4/cascade-012.htm"
       },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-control.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-control.htm"
+      },
+      {
+        "path": "css21_dev/html4/case-sensitive-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/case-sensitive-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/case-sensitive-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/case-sensitive-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/case-sensitive-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/case-sensitive-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/case-sensitive-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/case-sensitive-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/case-sensitive-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-006.htm"
+      },
       {
         "path": "css21_dev/html4/charset-attr-001.htm",
         "references": [
@@ -159942,6 +160841,16 @@
         ],
         "url": "/css21_dev/html4/collapsing-border-model-010b.htm"
       },
+      {
+        "path": "css21_dev/html4/color-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/color-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/color-000.htm"
+      },
       {
         "path": "css21_dev/html4/color-001.htm",
         "references": [
@@ -161612,6 +162521,16 @@
         ],
         "url": "/css21_dev/html4/colors-005.htm"
       },
+      {
+        "path": "css21_dev/html4/colors-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/colors-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/colors-006.htm"
+      },
       {
         "path": "css21_dev/html4/colors-007.htm",
         "references": [
@@ -162042,6 +162961,176 @@
         ],
         "url": "/css21_dev/html4/content-177.htm"
       },
+      {
+        "path": "css21_dev/html4/content-counter-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-007-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-008-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-008.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-009-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-010-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-011-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-011.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-011-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-012.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-013.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-014.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-015-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-015.htm"
+      },
+      {
+        "path": "css21_dev/html4/content-counter-016.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-016.htm"
+      },
       {
         "path": "css21_dev/html4/content-inherit-002.htm",
         "references": [
@@ -162072,6 +163161,86 @@
         ],
         "url": "/css21_dev/html4/content-type-001.htm"
       },
+      {
+        "path": "css21_dev/html4/core-syntax-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-007-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-008.htm"
+      },
+      {
+        "path": "css21_dev/html4/core-syntax-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-009.htm"
+      },
       {
         "path": "css21_dev/html4/counter-reset-increment-002.htm",
         "references": [
@@ -162082,6 +163251,16 @@
         ],
         "url": "/css21_dev/html4/counter-reset-increment-002.htm"
       },
+      {
+        "path": "css21_dev/html4/counters-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-001.htm"
+      },
       {
         "path": "css21_dev/html4/counters-002.htm",
         "references": [
@@ -162092,6 +163271,146 @@
         ],
         "url": "/css21_dev/html4/counters-002.htm"
       },
+      {
+        "path": "css21_dev/html4/counters-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-008.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/counters-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-010-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/declaration-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/declaration-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/declaration-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/declaration-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/declaration-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/declaration-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-006.htm"
+      },
       {
         "path": "css21_dev/html4/declaration-whitespace-001.htm",
         "references": [
@@ -162102,6 +163421,16 @@
         ],
         "url": "/css21_dev/html4/declaration-whitespace-001.htm"
       },
+      {
+        "path": "css21_dev/html4/declarations-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/declarations-009-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declarations-009.htm"
+      },
       {
         "path": "css21_dev/html4/default-attribute-selector-001.htm",
         "references": [
@@ -162972,6 +164301,166 @@
         ],
         "url": "/css21_dev/html4/escaped-ident-spaces-007.htm"
       },
+      {
+        "path": "css21_dev/html4/escaped-newline-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/escaped-newline-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escaped-newline-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/escapes-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-008.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-011.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-012.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/escapes-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-013.htm"
+      },
+      {
+        "path": "css21_dev/html4/escapes-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-014.htm"
+      },
       {
         "path": "css21_dev/html4/escapes-015.htm",
         "references": [
@@ -165948,6 +167437,46 @@
         ],
         "url": "/css21_dev/html4/font-family-invalid-characters-002.htm"
       },
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-006.htm"
+      },
       {
         "path": "css21_dev/html4/font-family-name-001.htm",
         "references": [
@@ -168128,6 +169657,146 @@
         ],
         "url": "/css21_dev/html4/id-selector-006.htm"
       },
+      {
+        "path": "css21_dev/html4/ident-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-005.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-008.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-011.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-012-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-012.htm"
+      },
+      {
+        "path": "css21_dev/html4/ident-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-013.htm"
+      },
       {
         "path": "css21_dev/html4/ident-014.htm",
         "references": [
@@ -168188,6 +169857,16 @@
         ],
         "url": "/css21_dev/html4/ident-019.htm"
       },
+      {
+        "path": "css21_dev/html4/ident-020.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-020.htm"
+      },
       {
         "path": "css21_dev/html4/ignored-rules-001.htm",
         "references": [
@@ -168258,6 +169937,26 @@
         ],
         "url": "/css21_dev/html4/ignored-rules-007.htm"
       },
+      {
+        "path": "css21_dev/html4/import-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/import-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/import-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/import-001.htm"
+      },
       {
         "path": "css21_dev/html4/inherit-static-offset-001.htm",
         "references": [
@@ -169618,6 +171317,26 @@
         ],
         "url": "/css21_dev/html4/invalid-decl-at-rule-002.htm"
       },
+      {
+        "path": "css21_dev/html4/keywords-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/keywords-000.htm"
+      },
+      {
+        "path": "css21_dev/html4/keywords-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/keywords-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/keywords-001.htm"
+      },
       {
         "path": "css21_dev/html4/lang-selector-002.htm",
         "references": [
@@ -171148,6 +172867,16 @@
         ],
         "url": "/css21_dev/html4/list-style-019.htm"
       },
+      {
+        "path": "css21_dev/html4/list-style-020.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/list-style-020-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/list-style-020.htm"
+      },
       {
         "path": "css21_dev/html4/list-style-021.htm",
         "references": [
@@ -174918,6 +176647,36 @@
         ],
         "url": "/css21_dev/html4/margin-top-applies-to-015.htm"
       },
+      {
+        "path": "css21_dev/html4/matching-brackets-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/matching-brackets-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/matching-brackets-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/matching-brackets-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/matching-brackets-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/matching-brackets-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/matching-brackets-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/matching-brackets-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/matching-brackets-003.htm"
+      },
       {
         "path": "css21_dev/html4/max-height-001.htm",
         "references": [
@@ -178758,6 +180517,16 @@
         ],
         "url": "/css21_dev/html4/numbers-units-003.htm"
       },
+      {
+        "path": "css21_dev/html4/numbers-units-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-filled-black-96px-square.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-004.htm"
+      },
       {
         "path": "css21_dev/html4/numbers-units-005.htm",
         "references": [
@@ -178768,6 +180537,90 @@
         ],
         "url": "/css21_dev/html4/numbers-units-005.htm"
       },
+      {
+        "path": "css21_dev/html4/numbers-units-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-filled-black-96px-square.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-006.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-007-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-007.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-009-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-009.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-010-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-010.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-011-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-011.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-012-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-012.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-013.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-014-ref-a.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/numbers-units-014-ref-b.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-015.htm"
+      },
       {
         "path": "css21_dev/html4/numbers-units-016.htm",
         "references": [
@@ -178788,6 +180641,36 @@
         ],
         "url": "/css21_dev/html4/numbers-units-017.htm"
       },
+      {
+        "path": "css21_dev/html4/numbers-units-018.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-018-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-018.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-019.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-019-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-019.htm"
+      },
+      {
+        "path": "css21_dev/html4/numbers-units-021.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-021-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-021.htm"
+      },
       {
         "path": "css21_dev/html4/other-attribute-001.htm",
         "references": [
@@ -183478,6 +185361,46 @@
         ],
         "url": "/css21_dev/html4/quoted-keywords-002.htm"
       },
+      {
+        "path": "css21_dev/html4/quoted-string-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/quoted-string-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-002.htm"
+      },
+      {
+        "path": "css21_dev/html4/quoted-string-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-003.htm"
+      },
+      {
+        "path": "css21_dev/html4/quoted-string-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-004.htm"
+      },
       {
         "path": "css21_dev/html4/quotes-035.htm",
         "references": [
@@ -185866,6 +187789,16 @@
         ],
         "url": "/css21_dev/html4/run-in-text-between-005.htm"
       },
+      {
+        "path": "css21_dev/html4/selectors-parsing-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/selectors-parsing-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/selectors-parsing-001.htm"
+      },
       {
         "path": "css21_dev/html4/separated-border-model-003a.htm",
         "references": [
@@ -185966,6 +187899,16 @@
         ],
         "url": "/css21_dev/html4/separated-border-model-009.htm"
       },
+      {
+        "path": "css21_dev/html4/sgml-comments-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/sgml-comments-000.htm"
+      },
       {
         "path": "css21_dev/html4/sgml-comments-001.htm",
         "references": [
@@ -185976,6 +187919,16 @@
         ],
         "url": "/css21_dev/html4/sgml-comments-001.htm"
       },
+      {
+        "path": "css21_dev/html4/sgml-comments-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/sgml-comments-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/sgml-comments-002.htm"
+      },
       {
         "path": "css21_dev/html4/shand-border-000.htm",
         "references": [
@@ -186196,6 +188149,16 @@
         ],
         "url": "/css21_dev/html4/stack-floats-004.htm"
       },
+      {
+        "path": "css21_dev/html4/strings-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/strings-000.htm"
+      },
       {
         "path": "css21_dev/html4/style-attr-cascade-001.htm",
         "references": [
@@ -187824,6 +189787,16 @@
         ],
         "url": "/css21_dev/html4/units-004.htm"
       },
+      {
+        "path": "css21_dev/html4/units-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/units-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/units-005.htm"
+      },
       {
         "path": "css21_dev/html4/units-006.htm",
         "references": [
@@ -187874,6 +189847,16 @@
         ],
         "url": "/css21_dev/html4/universal-selector-004.htm"
       },
+      {
+        "path": "css21_dev/html4/unterminated-string-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/unterminated-string-001.htm"
+      },
       {
         "path": "css21_dev/html4/uri-001.htm",
         "references": [
@@ -187904,6 +189887,26 @@
         ],
         "url": "/css21_dev/html4/uri-003.htm"
       },
+      {
+        "path": "css21_dev/html4/uri-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-004.htm"
+      },
+      {
+        "path": "css21_dev/html4/uri-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-005.htm"
+      },
       {
         "path": "css21_dev/html4/uri-006.htm",
         "references": [
@@ -187964,6 +189967,16 @@
         ],
         "url": "/css21_dev/html4/uri-011.htm"
       },
+      {
+        "path": "css21_dev/html4/uri-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/uri-012-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-012.htm"
+      },
       {
         "path": "css21_dev/html4/uri-013.htm",
         "references": [
@@ -187974,6 +189987,56 @@
         ],
         "url": "/css21_dev/html4/uri-013.htm"
       },
+      {
+        "path": "css21_dev/html4/uri-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-014.htm"
+      },
+      {
+        "path": "css21_dev/html4/uri-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-015.htm"
+      },
+      {
+        "path": "css21_dev/html4/uri-016.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/uri-016-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-016.htm"
+      },
+      {
+        "path": "css21_dev/html4/uri-017.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/uri-017-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-017.htm"
+      },
+      {
+        "path": "css21_dev/html4/uri-018.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-018.htm"
+      },
       {
         "path": "css21_dev/html4/vertical-align-004.htm",
         "references": [
@@ -189004,6 +191067,26 @@
         ],
         "url": "/css21_dev/html4/white-space-processing-049.htm"
       },
+      {
+        "path": "css21_dev/html4/whitespace-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/no-red-filler-text-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/whitespace-001.htm"
+      },
+      {
+        "path": "css21_dev/html4/whitespace-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/no-red-filler-text-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/whitespace-002.htm"
+      },
       {
         "path": "css21_dev/html4/width-001.htm",
         "references": [
@@ -194504,6 +196587,246 @@
         ],
         "url": "/css21_dev/xhtml1/anonymous-table-box-width-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-charset-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/at-charset-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-014.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-015.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-016.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-019.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-020.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-021.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-024.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-024.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-025.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-025.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-026.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-026.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-027.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-027.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-028.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-028.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-029.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-029.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-030.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-030.xht"
+      },
       {
         "path": "css21_dev/xhtml1/at-charset-033.xht",
         "references": [
@@ -194564,6 +196887,96 @@
         ],
         "url": "/css21_dev/xhtml1/at-charset-038.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-charset-040.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-040.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-041.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-041.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-042.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-042.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-043.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-043.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-044.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-044.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-045.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-045.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-046.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-046.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-047.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-047.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-048.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-048.xht"
+      },
       {
         "path": "css21_dev/xhtml1/at-charset-049.xht",
         "references": [
@@ -194614,6 +197027,16 @@
         ],
         "url": "/css21_dev/xhtml1/at-charset-053.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-charset-054.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-054.xht"
+      },
       {
         "path": "css21_dev/xhtml1/at-charset-055.xht",
         "references": [
@@ -194624,6 +197047,16 @@
         ],
         "url": "/css21_dev/xhtml1/at-charset-055.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-charset-056.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-056.xht"
+      },
       {
         "path": "css21_dev/xhtml1/at-charset-057.xht",
         "references": [
@@ -194654,6 +197087,96 @@
         ],
         "url": "/css21_dev/xhtml1/at-charset-059.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-charset-060.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-060.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-061.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-061.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-071.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-071.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-072.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-072.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-073.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-073.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-074.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-074.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-075.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-075.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-076.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-076.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-charset-077.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-077.xht"
+      },
       {
         "path": "css21_dev/xhtml1/at-charset-quotes-001.xht",
         "references": [
@@ -194804,6 +197327,66 @@
         ],
         "url": "/css21_dev/xhtml1/at-import-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-import-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-import-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-import-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-import-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-import-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-import-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-keywords-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-keywords-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-keywords-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-keywords-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1/at-rule-001.xht",
         "references": [
@@ -194924,6 +197507,66 @@
         ],
         "url": "/css21_dev/xhtml1/at-rule-012.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/at-rule-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/at-rule-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rule-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-rules-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-rules-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-rules-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-rules-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/at-rules-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1/attribute-selector-001.xht",
         "references": [
@@ -194944,6 +197587,16 @@
         ],
         "url": "/css21_dev/xhtml1/attribute-selector-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/attribute-token-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/attribute-token-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/attribute-token-selector-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1/attribute-value-selector-004.xht",
         "references": [
@@ -201726,6 +204379,16 @@
         ],
         "url": "/css21_dev/xhtml1/block-replaced-width-006.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/blocks-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/blocks-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/blocks-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/blocks-002.xht",
         "references": [
@@ -214602,6 +217265,16 @@
         ],
         "url": "/css21_dev/xhtml1/c544-valgn-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/c547-indent-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/c547-indent-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/c547-indent-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1/c547-indent-001.xht",
         "references": [
@@ -215222,6 +217895,16 @@
         ],
         "url": "/css21_dev/xhtml1/c5510-ipadn-000.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/c5510-padn-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/c5510-padn-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/c5510-padn-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1/c5510-padn-001.xht",
         "references": [
@@ -215712,6 +218395,136 @@
         ],
         "url": "/css21_dev/xhtml1/cascade-012.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-control.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-control.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/case-sensitive-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-007.xht"
+      },
       {
         "path": "css21_dev/xhtml1/charset-attr-001.xht",
         "references": [
@@ -216652,6 +219465,16 @@
         ],
         "url": "/css21_dev/xhtml1/collapsing-border-model-010b.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/color-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/color-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/color-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1/color-001.xht",
         "references": [
@@ -218232,6 +221055,16 @@
         ],
         "url": "/css21_dev/xhtml1/colors-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/colors-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/colors-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/colors-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1/colors-007.xht",
         "references": [
@@ -218662,6 +221495,176 @@
         ],
         "url": "/css21_dev/xhtml1/content-177.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/content-counter-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-008-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-014.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-015-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-015.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/content-counter-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-016.xht"
+      },
       {
         "path": "css21_dev/xhtml1/content-inherit-002.xht",
         "references": [
@@ -218692,6 +221695,86 @@
         ],
         "url": "/css21_dev/xhtml1/content-type-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/core-syntax-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-009.xht"
+      },
       {
         "path": "css21_dev/xhtml1/counter-reset-increment-002.xht",
         "references": [
@@ -218702,6 +221785,16 @@
         ],
         "url": "/css21_dev/xhtml1/counter-reset-increment-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/counters-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/counters-002.xht",
         "references": [
@@ -218712,6 +221805,146 @@
         ],
         "url": "/css21_dev/xhtml1/counters-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/counters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/counters-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/declaration-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/declaration-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/declaration-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/declaration-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/declaration-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/declaration-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1/declaration-whitespace-001.xht",
         "references": [
@@ -218722,6 +221955,16 @@
         ],
         "url": "/css21_dev/xhtml1/declaration-whitespace-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/declarations-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/declarations-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declarations-009.xht"
+      },
       {
         "path": "css21_dev/xhtml1/default-attribute-selector-001.xht",
         "references": [
@@ -219562,6 +222805,166 @@
         ],
         "url": "/css21_dev/xhtml1/escaped-ident-spaces-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/escaped-newline-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/escaped-newline-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escaped-newline-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/escapes-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/escapes-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/escapes-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-014.xht"
+      },
       {
         "path": "css21_dev/xhtml1/escapes-015.xht",
         "references": [
@@ -222398,6 +225801,46 @@
         ],
         "url": "/css21_dev/xhtml1/font-family-invalid-characters-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1/font-family-name-001.xht",
         "references": [
@@ -224538,6 +227981,146 @@
         ],
         "url": "/css21_dev/xhtml1/id-selector-006.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/ident-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/ident-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-013.xht"
+      },
       {
         "path": "css21_dev/xhtml1/ident-014.xht",
         "references": [
@@ -224598,6 +228181,16 @@
         ],
         "url": "/css21_dev/xhtml1/ident-019.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/ident-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-020.xht"
+      },
       {
         "path": "css21_dev/xhtml1/ignored-rules-001.xht",
         "references": [
@@ -224668,6 +228261,26 @@
         ],
         "url": "/css21_dev/xhtml1/ignored-rules-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/import-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/import-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/import-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/import-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/inherit-static-offset-001.xht",
         "references": [
@@ -226108,6 +229721,26 @@
         ],
         "url": "/css21_dev/xhtml1/invalid-decl-at-rule-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/keywords-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/keywords-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/keywords-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/lang-selector-002.xht",
         "references": [
@@ -227508,6 +231141,16 @@
         ],
         "url": "/css21_dev/xhtml1/line-height-bleed-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/list-style-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/list-style-020-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/list-style-020.xht"
+      },
       {
         "path": "css21_dev/xhtml1/list-style-image-004.xht",
         "references": [
@@ -231258,6 +234901,36 @@
         ],
         "url": "/css21_dev/xhtml1/margin-top-applies-to-015.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/matching-brackets-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/matching-brackets-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/matching-brackets-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/matching-brackets-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/matching-brackets-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/matching-brackets-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/matching-brackets-003.xht"
+      },
       {
         "path": "css21_dev/xhtml1/max-height-001.xht",
         "references": [
@@ -235098,6 +238771,16 @@
         ],
         "url": "/css21_dev/xhtml1/numbers-units-003.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1/numbers-units-005.xht",
         "references": [
@@ -235108,6 +238791,90 @@
         ],
         "url": "/css21_dev/xhtml1/numbers-units-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-014-ref-a.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-014-ref-b.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-015.xht"
+      },
       {
         "path": "css21_dev/xhtml1/numbers-units-016.xht",
         "references": [
@@ -235128,6 +238895,36 @@
         ],
         "url": "/css21_dev/xhtml1/numbers-units-017.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-018-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-018.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-019-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-019.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/numbers-units-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-021-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-021.xht"
+      },
       {
         "path": "css21_dev/xhtml1/other-attribute-001.xht",
         "references": [
@@ -239788,6 +243585,46 @@
         ],
         "url": "/css21_dev/xhtml1/quoted-keywords-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/quoted-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/quoted-string-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/quoted-string-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/quoted-string-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1/quotes-035.xht",
         "references": [
@@ -242166,6 +246003,16 @@
         ],
         "url": "/css21_dev/xhtml1/run-in-text-between-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/selectors-parsing-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/selectors-parsing-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/selectors-parsing-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/separated-border-model-003a.xht",
         "references": [
@@ -242266,6 +246113,16 @@
         ],
         "url": "/css21_dev/xhtml1/separated-border-model-009.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/sgml-comments-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/sgml-comments-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1/sgml-comments-001.xht",
         "references": [
@@ -242276,6 +246133,16 @@
         ],
         "url": "/css21_dev/xhtml1/sgml-comments-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/sgml-comments-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/sgml-comments-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/sgml-comments-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1/shand-border-000.xht",
         "references": [
@@ -242496,6 +246363,16 @@
         ],
         "url": "/css21_dev/xhtml1/stack-floats-004.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/strings-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/strings-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1/style-attr-cascade-001.xht",
         "references": [
@@ -244094,6 +247971,16 @@
         ],
         "url": "/css21_dev/xhtml1/units-004.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/units-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/units-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/units-005.xht"
+      },
       {
         "path": "css21_dev/xhtml1/units-006.xht",
         "references": [
@@ -244144,6 +248031,16 @@
         ],
         "url": "/css21_dev/xhtml1/universal-selector-004.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/unterminated-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/unterminated-string-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1/uri-001.xht",
         "references": [
@@ -244174,6 +248071,26 @@
         ],
         "url": "/css21_dev/xhtml1/uri-003.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/uri-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/uri-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-005.xht"
+      },
       {
         "path": "css21_dev/xhtml1/uri-006.xht",
         "references": [
@@ -244234,6 +248151,16 @@
         ],
         "url": "/css21_dev/xhtml1/uri-011.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/uri-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/uri-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-012.xht"
+      },
       {
         "path": "css21_dev/xhtml1/uri-013.xht",
         "references": [
@@ -244244,6 +248171,56 @@
         ],
         "url": "/css21_dev/xhtml1/uri-013.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/uri-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-014.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/uri-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-015.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/uri-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/uri-016-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-016.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/uri-017.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/uri-017-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-017.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/uri-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-018.xht"
+      },
       {
         "path": "css21_dev/xhtml1/vertical-align-004.xht",
         "references": [
@@ -245254,6 +249231,26 @@
         ],
         "url": "/css21_dev/xhtml1/white-space-processing-049.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/whitespace-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/whitespace-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1/whitespace-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/whitespace-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1/width-001.xht",
         "references": [
@@ -250754,6 +254751,246 @@
         ],
         "url": "/css21_dev/xhtml1print/anonymous-table-box-width-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/at-charset-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-014.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-015.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-016.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-019.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-020.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-021.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-024.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-024.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-025.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-025.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-026.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-026.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-027.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-027.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-028.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-028.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-029.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-029.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-030.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-030.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/at-charset-033.xht",
         "references": [
@@ -250814,6 +255051,96 @@
         ],
         "url": "/css21_dev/xhtml1print/at-charset-038.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-040.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-040.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-041.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-041.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-042.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-042.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-043.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-043.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-044.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-044.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-045.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-045.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-046.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-046.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-047.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-047.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-048.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-048.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/at-charset-049.xht",
         "references": [
@@ -250864,6 +255191,16 @@
         ],
         "url": "/css21_dev/xhtml1print/at-charset-053.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-054.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-054.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/at-charset-055.xht",
         "references": [
@@ -250874,6 +255211,16 @@
         ],
         "url": "/css21_dev/xhtml1print/at-charset-055.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-056.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-056.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/at-charset-057.xht",
         "references": [
@@ -250904,6 +255251,96 @@
         ],
         "url": "/css21_dev/xhtml1print/at-charset-059.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-060.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-060.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-061.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-061.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-071.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-071.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-072.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-072.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-073.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-073.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-074.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-074.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-075.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-075.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-076.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-076.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-charset-077.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-077.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/at-charset-quotes-001.xht",
         "references": [
@@ -251054,6 +255491,66 @@
         ],
         "url": "/css21_dev/xhtml1print/at-import-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-import-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-import-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-import-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-import-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-import-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-import-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-keywords-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-keywords-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-keywords-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-keywords-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/at-rule-001.xht",
         "references": [
@@ -251174,6 +255671,66 @@
         ],
         "url": "/css21_dev/xhtml1print/at-rule-012.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/at-rule-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/at-rule-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rule-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-rules-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-rules-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-rules-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-rules-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/at-rules-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/attribute-selector-001.xht",
         "references": [
@@ -251194,6 +255751,16 @@
         ],
         "url": "/css21_dev/xhtml1print/attribute-selector-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/attribute-token-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/attribute-token-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/attribute-token-selector-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/attribute-value-selector-004.xht",
         "references": [
@@ -257976,6 +262543,16 @@
         ],
         "url": "/css21_dev/xhtml1print/block-replaced-width-006.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/blocks-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/blocks-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/blocks-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/blocks-002.xht",
         "references": [
@@ -270852,6 +275429,16 @@
         ],
         "url": "/css21_dev/xhtml1print/c544-valgn-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/c547-indent-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/c547-indent-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/c547-indent-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/c547-indent-001.xht",
         "references": [
@@ -271472,6 +276059,16 @@
         ],
         "url": "/css21_dev/xhtml1print/c5510-ipadn-000.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/c5510-padn-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/c5510-padn-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/c5510-padn-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/c5510-padn-001.xht",
         "references": [
@@ -271962,6 +276559,136 @@
         ],
         "url": "/css21_dev/xhtml1print/cascade-012.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-control.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-control.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/case-sensitive-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-007.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/charset-attr-001.xht",
         "references": [
@@ -272902,6 +277629,16 @@
         ],
         "url": "/css21_dev/xhtml1print/collapsing-border-model-010b.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/color-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/color-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/color-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/color-001.xht",
         "references": [
@@ -274482,6 +279219,16 @@
         ],
         "url": "/css21_dev/xhtml1print/colors-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/colors-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/colors-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/colors-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/colors-007.xht",
         "references": [
@@ -274912,6 +279659,176 @@
         ],
         "url": "/css21_dev/xhtml1print/content-177.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-008-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-014.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-015-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-015.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/content-counter-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-016.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/content-inherit-002.xht",
         "references": [
@@ -274942,6 +279859,86 @@
         ],
         "url": "/css21_dev/xhtml1print/content-type-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-009.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/counter-reset-increment-002.xht",
         "references": [
@@ -274952,6 +279949,16 @@
         ],
         "url": "/css21_dev/xhtml1print/counter-reset-increment-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/counters-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/counters-002.xht",
         "references": [
@@ -274962,6 +279969,146 @@
         ],
         "url": "/css21_dev/xhtml1print/counters-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/counters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/counters-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/declaration-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/declaration-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/declaration-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/declaration-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/declaration-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/declaration-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/declaration-whitespace-001.xht",
         "references": [
@@ -274972,6 +280119,16 @@
         ],
         "url": "/css21_dev/xhtml1print/declaration-whitespace-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/declarations-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/declarations-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declarations-009.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/default-attribute-selector-001.xht",
         "references": [
@@ -275812,6 +280969,166 @@
         ],
         "url": "/css21_dev/xhtml1print/escaped-ident-spaces-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/escaped-newline-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/escaped-newline-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escaped-newline-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/escapes-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/escapes-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/escapes-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-014.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/escapes-015.xht",
         "references": [
@@ -278648,6 +283965,46 @@
         ],
         "url": "/css21_dev/xhtml1print/font-family-invalid-characters-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-006.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/font-family-name-001.xht",
         "references": [
@@ -280788,6 +286145,146 @@
         ],
         "url": "/css21_dev/xhtml1print/id-selector-006.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/ident-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-005.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-008.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/ident-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-013.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/ident-014.xht",
         "references": [
@@ -280848,6 +286345,16 @@
         ],
         "url": "/css21_dev/xhtml1print/ident-019.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/ident-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-020.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/ignored-rules-001.xht",
         "references": [
@@ -280918,6 +286425,26 @@
         ],
         "url": "/css21_dev/xhtml1print/ignored-rules-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/import-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/import-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/import-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/import-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/inherit-static-offset-001.xht",
         "references": [
@@ -282358,6 +287885,26 @@
         ],
         "url": "/css21_dev/xhtml1print/invalid-decl-at-rule-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/keywords-000.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/keywords-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/keywords-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/lang-selector-002.xht",
         "references": [
@@ -283758,6 +289305,16 @@
         ],
         "url": "/css21_dev/xhtml1print/line-height-bleed-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/list-style-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/list-style-020-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/list-style-020.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/list-style-image-004.xht",
         "references": [
@@ -287508,6 +293065,36 @@
         ],
         "url": "/css21_dev/xhtml1print/margin-top-applies-to-015.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/matching-brackets-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/matching-brackets-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/matching-brackets-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/matching-brackets-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/matching-brackets-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/matching-brackets-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/matching-brackets-003.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/max-height-001.xht",
         "references": [
@@ -291348,6 +296935,16 @@
         ],
         "url": "/css21_dev/xhtml1print/numbers-units-003.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/numbers-units-005.xht",
         "references": [
@@ -291358,6 +296955,90 @@
         ],
         "url": "/css21_dev/xhtml1print/numbers-units-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-006.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-007.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-009.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-010.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-011.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-012.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-013.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-014-ref-a.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-014-ref-b.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-015.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/numbers-units-016.xht",
         "references": [
@@ -291378,6 +297059,36 @@
         ],
         "url": "/css21_dev/xhtml1print/numbers-units-017.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-018-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-018.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-019-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-019.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-021-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-021.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/other-attribute-001.xht",
         "references": [
@@ -296038,6 +301749,46 @@
         ],
         "url": "/css21_dev/xhtml1print/quoted-keywords-002.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-002.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-003.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-004.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/quotes-035.xht",
         "references": [
@@ -298416,6 +304167,16 @@
         ],
         "url": "/css21_dev/xhtml1print/run-in-text-between-005.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/selectors-parsing-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/selectors-parsing-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/selectors-parsing-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/separated-border-model-003a.xht",
         "references": [
@@ -298516,6 +304277,16 @@
         ],
         "url": "/css21_dev/xhtml1print/separated-border-model-009.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/sgml-comments-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/sgml-comments-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/sgml-comments-001.xht",
         "references": [
@@ -298526,6 +304297,16 @@
         ],
         "url": "/css21_dev/xhtml1print/sgml-comments-001.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/sgml-comments-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/sgml-comments-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/sgml-comments-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/shand-border-000.xht",
         "references": [
@@ -298746,6 +304527,16 @@
         ],
         "url": "/css21_dev/xhtml1print/stack-floats-004.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/strings-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/strings-000.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/style-attr-cascade-001.xht",
         "references": [
@@ -300344,6 +306135,16 @@
         ],
         "url": "/css21_dev/xhtml1print/units-004.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/units-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/units-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/units-005.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/units-006.xht",
         "references": [
@@ -300394,6 +306195,16 @@
         ],
         "url": "/css21_dev/xhtml1print/universal-selector-004.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/unterminated-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/unterminated-string-001.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/uri-001.xht",
         "references": [
@@ -300424,6 +306235,26 @@
         ],
         "url": "/css21_dev/xhtml1print/uri-003.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/uri-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-004.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/uri-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-005.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/uri-006.xht",
         "references": [
@@ -300484,6 +306315,16 @@
         ],
         "url": "/css21_dev/xhtml1print/uri-011.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/uri-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/uri-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-012.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/uri-013.xht",
         "references": [
@@ -300494,6 +306335,56 @@
         ],
         "url": "/css21_dev/xhtml1print/uri-013.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/uri-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-014.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/uri-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-015.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/uri-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/uri-016-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-016.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/uri-017.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/uri-017-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-017.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/uri-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-018.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/vertical-align-004.xht",
         "references": [
@@ -301504,6 +307395,26 @@
         ],
         "url": "/css21_dev/xhtml1print/white-space-processing-049.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/whitespace-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/whitespace-001.xht"
+      },
+      {
+        "path": "css21_dev/xhtml1print/whitespace-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/whitespace-002.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/width-001.xht",
         "references": [
@@ -340846,6 +346757,54 @@
         "url": "/css-fonts-3_dev/html/font-family-invalid-characters-002.htm"
       }
     ],
+    "css-fonts-3_dev/html/font-family-invalid-characters-003.htm": [
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-003.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-003.htm"
+      }
+    ],
+    "css-fonts-3_dev/html/font-family-invalid-characters-004.htm": [
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-004.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-004.htm"
+      }
+    ],
+    "css-fonts-3_dev/html/font-family-invalid-characters-005.htm": [
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-005.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-005.htm"
+      }
+    ],
+    "css-fonts-3_dev/html/font-family-invalid-characters-006.htm": [
+      {
+        "path": "css-fonts-3_dev/html/font-family-invalid-characters-006.htm",
+        "references": [
+          [
+            "/css-fonts-3_dev/html/reference/font-family-invalid-characters-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/html/font-family-invalid-characters-006.htm"
+      }
+    ],
     "css-fonts-3_dev/html/font-family-name-001.htm": [
       {
         "path": "css-fonts-3_dev/html/font-family-name-001.htm",
@@ -342466,6 +348425,54 @@
         "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-002.xht"
       }
     ],
+    "css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-003.xht"
+      }
+    ],
+    "css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-004.xht"
+      }
+    ],
+    "css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-005.xht"
+      }
+    ],
+    "css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1/font-family-invalid-characters-006.xht"
+      }
+    ],
     "css-fonts-3_dev/xhtml1/font-family-name-001.xht": [
       {
         "path": "css-fonts-3_dev/xhtml1/font-family-name-001.xht",
@@ -344062,6 +350069,54 @@
         "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-002.xht"
       }
     ],
+    "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-003.xht"
+      }
+    ],
+    "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-004.xht"
+      }
+    ],
+    "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-005.xht"
+      }
+    ],
+    "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht": [
+      {
+        "path": "css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css-fonts-3_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css-fonts-3_dev/xhtml1print/font-family-invalid-characters-006.xht"
+      }
+    ],
     "css-fonts-3_dev/xhtml1print/font-family-name-001.xht": [
       {
         "path": "css-fonts-3_dev/xhtml1print/font-family-name-001.xht",
@@ -374242,6 +380297,18 @@
         "url": "/css-style-attr-1_dev/xhtml1print/style-attr-urls-003.xht"
       }
     ],
+    "css-text-3_dev/html/bidi-004.htm": [
+      {
+        "path": "css-text-3_dev/html/bidi-004.htm",
+        "references": [
+          [
+            "/css-text-3_dev/html/reference/bidi-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-text-3_dev/html/bidi-004.htm"
+      }
+    ],
     "css-text-3_dev/html/css3-text-line-break-jazh-001.htm": [
       {
         "path": "css-text-3_dev/html/css3-text-line-break-jazh-001.htm",
@@ -446578,6 +452645,18 @@
         "url": "/css-writing-modes-3_dev/html/bidi-003.htm"
       }
     ],
+    "css-writing-modes-3_dev/html/bidi-004.htm": [
+      {
+        "path": "css-writing-modes-3_dev/html/bidi-004.htm",
+        "references": [
+          [
+            "/css-writing-modes-3_dev/html/reference/bidi-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css-writing-modes-3_dev/html/bidi-004.htm"
+      }
+    ],
     "css-writing-modes-3_dev/html/bidi-011.htm": [
       {
         "path": "css-writing-modes-3_dev/html/bidi-011.htm",
@@ -451962,100 +458041,100 @@
         "url": "/css-writing-modes-3_dev/html/unicode-bidi-applies-to-015.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-002.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-002.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-002.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-002.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-002.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-002.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-003.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-003.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-003.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-003.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-002-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-002-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-003.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-003.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-004.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-004.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-004.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-004.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-004.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-004.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-005.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-005.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-005.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-005.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-004-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-004-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-005.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-005.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-006.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-006.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-006.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-006.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-006.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-006.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-007.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-007.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-007.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-007.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-006-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-006-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-007.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-007.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-008.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-008.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-008.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-008.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-008-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-008.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-008.htm"
       }
     ],
-    "css-writing-modes-3_dev/html/vertical-alignment-new-009.htm": [
+    "css-writing-modes-3_dev/html/vertical-alignment-009.htm": [
       {
-        "path": "css-writing-modes-3_dev/html/vertical-alignment-new-009.htm",
+        "path": "css-writing-modes-3_dev/html/vertical-alignment-009.htm",
         "references": [
           [
-            "/css-writing-modes-3_dev/html/reference/vertical-alignment-new-008-ref.htm",
+            "/css-writing-modes-3_dev/html/reference/vertical-alignment-008-ref.htm",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/html/vertical-alignment-new-009.htm"
+        "url": "/css-writing-modes-3_dev/html/vertical-alignment-009.htm"
       }
     ],
     "css-writing-modes-3_dev/html/writing-mode-horizontal-001l.htm": [
@@ -460082,100 +466161,100 @@
         "url": "/css-writing-modes-3_dev/xhtml1/unicode-bidi-applies-to-014.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-002.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-002.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-003.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-003.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-004.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-004.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-005.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-005.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-006.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-006.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-007.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-007.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-008.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-008.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht": [
+    "css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht",
+        "path": "css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-new-009.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1/vertical-alignment-009.xht"
       }
     ],
     "css-writing-modes-3_dev/xhtml1/writing-mode-horizontal-001l.xht": [
@@ -468190,100 +474269,100 @@
         "url": "/css-writing-modes-3_dev/xhtml1print/unicode-bidi-applies-to-014.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-002.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-002.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-002-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-002-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-003.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-003.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-004.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-004.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-004-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-004-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-005.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-005.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-006.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-006.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-006-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-006-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-007.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-007.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-008.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-008.xht"
       }
     ],
-    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht": [
+    "css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht": [
       {
-        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht",
+        "path": "css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht",
         "references": [
           [
-            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-new-008-ref.xht",
+            "/css-writing-modes-3_dev/xhtml1print/reference/vertical-alignment-008-ref.xht",
             "=="
           ]
         ],
-        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-new-009.xht"
+        "url": "/css-writing-modes-3_dev/xhtml1print/vertical-alignment-009.xht"
       }
     ],
     "css-writing-modes-3_dev/xhtml1print/writing-mode-horizontal-001l.xht": [
@@ -473338,6 +479417,306 @@
         "url": "/css21_dev/html4/anonymous-table-box-width-001.htm"
       }
     ],
+    "css21_dev/html4/at-charset-001.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/at-charset-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-001.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-002.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-002.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-003.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-003.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-004.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-004.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-005.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-005.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-006.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-006.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-007.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-007.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-008.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-008.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-009.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-009.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-010.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-010.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-011.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-011.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-012.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-012.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-014.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-014.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-015.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-015.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-016.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-016.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-016.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-019.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-019.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-019.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-020.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-020.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-020.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-021.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-021.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-021.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-024.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-024.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-024.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-025.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-025.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-025.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-026.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-026.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-026.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-027.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-027.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-027.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-028.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-028.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-028.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-029.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-029.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-029.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-030.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-030.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-030.htm"
+      }
+    ],
     "css21_dev/html4/at-charset-033.htm": [
       {
         "path": "css21_dev/html4/at-charset-033.htm",
@@ -473410,6 +479789,114 @@
         "url": "/css21_dev/html4/at-charset-038.htm"
       }
     ],
+    "css21_dev/html4/at-charset-040.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-040.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-040.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-041.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-041.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-041.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-042.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-042.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-042.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-043.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-043.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-043.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-044.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-044.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-044.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-045.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-045.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-045.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-046.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-046.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-046.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-047.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-047.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-047.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-048.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-048.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-048.htm"
+      }
+    ],
     "css21_dev/html4/at-charset-049.htm": [
       {
         "path": "css21_dev/html4/at-charset-049.htm",
@@ -473470,6 +479957,18 @@
         "url": "/css21_dev/html4/at-charset-053.htm"
       }
     ],
+    "css21_dev/html4/at-charset-054.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-054.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-054.htm"
+      }
+    ],
     "css21_dev/html4/at-charset-055.htm": [
       {
         "path": "css21_dev/html4/at-charset-055.htm",
@@ -473482,6 +479981,18 @@
         "url": "/css21_dev/html4/at-charset-055.htm"
       }
     ],
+    "css21_dev/html4/at-charset-056.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-056.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-056.htm"
+      }
+    ],
     "css21_dev/html4/at-charset-057.htm": [
       {
         "path": "css21_dev/html4/at-charset-057.htm",
@@ -473518,6 +480029,114 @@
         "url": "/css21_dev/html4/at-charset-059.htm"
       }
     ],
+    "css21_dev/html4/at-charset-060.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-060.htm",
+        "references": [
+          [
+            "/css21_dev/html4/at-charset-001.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-060.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-061.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-061.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-061.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-071.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-071.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-071.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-072.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-072.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-072.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-073.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-073.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-073.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-074.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-074.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-074.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-075.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-075.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-075.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-076.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-076.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-076.htm"
+      }
+    ],
+    "css21_dev/html4/at-charset-077.htm": [
+      {
+        "path": "css21_dev/html4/at-charset-077.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-charset-077.htm"
+      }
+    ],
     "css21_dev/html4/at-charset-quotes-001.htm": [
       {
         "path": "css21_dev/html4/at-charset-quotes-001.htm",
@@ -473698,6 +480317,78 @@
         "url": "/css21_dev/html4/at-import-007.htm"
       }
     ],
+    "css21_dev/html4/at-import-009.htm": [
+      {
+        "path": "css21_dev/html4/at-import-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-import-009.htm"
+      }
+    ],
+    "css21_dev/html4/at-import-010.htm": [
+      {
+        "path": "css21_dev/html4/at-import-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-import-010.htm"
+      }
+    ],
+    "css21_dev/html4/at-import-011.htm": [
+      {
+        "path": "css21_dev/html4/at-import-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-import-011.htm"
+      }
+    ],
+    "css21_dev/html4/at-keywords-000.htm": [
+      {
+        "path": "css21_dev/html4/at-keywords-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-keywords-000.htm"
+      }
+    ],
+    "css21_dev/html4/at-keywords-001.htm": [
+      {
+        "path": "css21_dev/html4/at-keywords-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-keywords-001.htm"
+      }
+    ],
+    "css21_dev/html4/at-keywords-002.htm": [
+      {
+        "path": "css21_dev/html4/at-keywords-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-keywords-002.htm"
+      }
+    ],
     "css21_dev/html4/at-rule-001.htm": [
       {
         "path": "css21_dev/html4/at-rule-001.htm",
@@ -473842,6 +480533,78 @@
         "url": "/css21_dev/html4/at-rule-012.htm"
       }
     ],
+    "css21_dev/html4/at-rule-013.htm": [
+      {
+        "path": "css21_dev/html4/at-rule-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/at-rule-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rule-013.htm"
+      }
+    ],
+    "css21_dev/html4/at-rules-000.htm": [
+      {
+        "path": "css21_dev/html4/at-rules-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-000.htm"
+      }
+    ],
+    "css21_dev/html4/at-rules-001.htm": [
+      {
+        "path": "css21_dev/html4/at-rules-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-001.htm"
+      }
+    ],
+    "css21_dev/html4/at-rules-002.htm": [
+      {
+        "path": "css21_dev/html4/at-rules-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-002.htm"
+      }
+    ],
+    "css21_dev/html4/at-rules-003.htm": [
+      {
+        "path": "css21_dev/html4/at-rules-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-003.htm"
+      }
+    ],
+    "css21_dev/html4/at-rules-004.htm": [
+      {
+        "path": "css21_dev/html4/at-rules-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/at-rules-004.htm"
+      }
+    ],
     "css21_dev/html4/attribute-selector-001.htm": [
       {
         "path": "css21_dev/html4/attribute-selector-001.htm",
@@ -473866,6 +480629,18 @@
         "url": "/css21_dev/html4/attribute-selector-002.htm"
       }
     ],
+    "css21_dev/html4/attribute-token-selector-002.htm": [
+      {
+        "path": "css21_dev/html4/attribute-token-selector-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/attribute-token-selector-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/attribute-token-selector-002.htm"
+      }
+    ],
     "css21_dev/html4/attribute-value-selector-004.htm": [
       {
         "path": "css21_dev/html4/attribute-value-selector-004.htm",
@@ -480114,6 +486889,18 @@
         "url": "/css21_dev/html4/bidi-003.htm"
       }
     ],
+    "css21_dev/html4/bidi-004.htm": [
+      {
+        "path": "css21_dev/html4/bidi-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/bidi-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/bidi-004.htm"
+      }
+    ],
     "css21_dev/html4/bidi-005a.htm": [
       {
         "path": "css21_dev/html4/bidi-005a.htm",
@@ -482094,6 +488881,18 @@
         "url": "/css21_dev/html4/block-replaced-width-006.htm"
       }
     ],
+    "css21_dev/html4/blocks-001.htm": [
+      {
+        "path": "css21_dev/html4/blocks-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/blocks-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/blocks-001.htm"
+      }
+    ],
     "css21_dev/html4/blocks-002.htm": [
       {
         "path": "css21_dev/html4/blocks-002.htm",
@@ -497554,6 +504353,18 @@
         "url": "/css21_dev/html4/c544-valgn-001.htm"
       }
     ],
+    "css21_dev/html4/c547-indent-000.htm": [
+      {
+        "path": "css21_dev/html4/c547-indent-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/c547-indent-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/c547-indent-000.htm"
+      }
+    ],
     "css21_dev/html4/c547-indent-001.htm": [
       {
         "path": "css21_dev/html4/c547-indent-001.htm",
@@ -498298,6 +505109,18 @@
         "url": "/css21_dev/html4/c5510-ipadn-000.htm"
       }
     ],
+    "css21_dev/html4/c5510-padn-000.htm": [
+      {
+        "path": "css21_dev/html4/c5510-padn-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/c5510-padn-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/c5510-padn-000.htm"
+      }
+    ],
     "css21_dev/html4/c5510-padn-001.htm": [
       {
         "path": "css21_dev/html4/c5510-padn-001.htm",
@@ -498922,6 +505745,162 @@
         "url": "/css21_dev/html4/cascade-012.htm"
       }
     ],
+    "css21_dev/html4/cascade-import-dynamic-001.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-001.htm"
+      }
+    ],
+    "css21_dev/html4/cascade-import-dynamic-002.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-002.htm"
+      }
+    ],
+    "css21_dev/html4/cascade-import-dynamic-003.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-003.htm"
+      }
+    ],
+    "css21_dev/html4/cascade-import-dynamic-004.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-004.htm"
+      }
+    ],
+    "css21_dev/html4/cascade-import-dynamic-005.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-005.htm"
+      }
+    ],
+    "css21_dev/html4/cascade-import-dynamic-006.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-006.htm"
+      }
+    ],
+    "css21_dev/html4/cascade-import-dynamic-control.htm": [
+      {
+        "path": "css21_dev/html4/cascade-import-dynamic-control.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/cascade-import-dynamic-control.htm"
+      }
+    ],
+    "css21_dev/html4/case-sensitive-000.htm": [
+      {
+        "path": "css21_dev/html4/case-sensitive-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-000.htm"
+      }
+    ],
+    "css21_dev/html4/case-sensitive-001.htm": [
+      {
+        "path": "css21_dev/html4/case-sensitive-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-001.htm"
+      }
+    ],
+    "css21_dev/html4/case-sensitive-003.htm": [
+      {
+        "path": "css21_dev/html4/case-sensitive-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/case-sensitive-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-003.htm"
+      }
+    ],
+    "css21_dev/html4/case-sensitive-004.htm": [
+      {
+        "path": "css21_dev/html4/case-sensitive-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/case-sensitive-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-004.htm"
+      }
+    ],
+    "css21_dev/html4/case-sensitive-005.htm": [
+      {
+        "path": "css21_dev/html4/case-sensitive-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/case-sensitive-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-005.htm"
+      }
+    ],
+    "css21_dev/html4/case-sensitive-006.htm": [
+      {
+        "path": "css21_dev/html4/case-sensitive-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/case-sensitive-006.htm"
+      }
+    ],
     "css21_dev/html4/charset-attr-001.htm": [
       {
         "path": "css21_dev/html4/charset-attr-001.htm",
@@ -500050,6 +507029,18 @@
         "url": "/css21_dev/html4/collapsing-border-model-010b.htm"
       }
     ],
+    "css21_dev/html4/color-000.htm": [
+      {
+        "path": "css21_dev/html4/color-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/color-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/color-000.htm"
+      }
+    ],
     "css21_dev/html4/color-001.htm": [
       {
         "path": "css21_dev/html4/color-001.htm",
@@ -502054,6 +509045,18 @@
         "url": "/css21_dev/html4/colors-005.htm"
       }
     ],
+    "css21_dev/html4/colors-006.htm": [
+      {
+        "path": "css21_dev/html4/colors-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/colors-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/colors-006.htm"
+      }
+    ],
     "css21_dev/html4/colors-007.htm": [
       {
         "path": "css21_dev/html4/colors-007.htm",
@@ -502570,6 +509573,210 @@
         "url": "/css21_dev/html4/content-177.htm"
       }
     ],
+    "css21_dev/html4/content-counter-000.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-000.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-001.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-001.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-002.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-002.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-003.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-003.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-004.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-004.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-005.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-005.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-006.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-006.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-007.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-007-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-007.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-008.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-008-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-008.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-009.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-009-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-009.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-010.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-010-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-010.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-011.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-011-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-011.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-012.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-011-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-012.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-013.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-013.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-014.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-014.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-015.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-015-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-015.htm"
+      }
+    ],
+    "css21_dev/html4/content-counter-016.htm": [
+      {
+        "path": "css21_dev/html4/content-counter-016.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/content-counter-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/content-counter-016.htm"
+      }
+    ],
     "css21_dev/html4/content-inherit-002.htm": [
       {
         "path": "css21_dev/html4/content-inherit-002.htm",
@@ -502606,6 +509813,102 @@
         "url": "/css21_dev/html4/content-type-001.htm"
       }
     ],
+    "css21_dev/html4/core-syntax-001.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-001.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-002.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-002.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-003.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-003.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-004.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-004.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-006.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-006.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-007.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/core-syntax-007-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-007.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-008.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-008.htm"
+      }
+    ],
+    "css21_dev/html4/core-syntax-009.htm": [
+      {
+        "path": "css21_dev/html4/core-syntax-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/core-syntax-009.htm"
+      }
+    ],
     "css21_dev/html4/counter-reset-increment-002.htm": [
       {
         "path": "css21_dev/html4/counter-reset-increment-002.htm",
@@ -502618,6 +509921,18 @@
         "url": "/css21_dev/html4/counter-reset-increment-002.htm"
       }
     ],
+    "css21_dev/html4/counters-001.htm": [
+      {
+        "path": "css21_dev/html4/counters-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-001.htm"
+      }
+    ],
     "css21_dev/html4/counters-002.htm": [
       {
         "path": "css21_dev/html4/counters-002.htm",
@@ -502630,6 +509945,174 @@
         "url": "/css21_dev/html4/counters-002.htm"
       }
     ],
+    "css21_dev/html4/counters-003.htm": [
+      {
+        "path": "css21_dev/html4/counters-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-003.htm"
+      }
+    ],
+    "css21_dev/html4/counters-004.htm": [
+      {
+        "path": "css21_dev/html4/counters-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-004.htm"
+      }
+    ],
+    "css21_dev/html4/counters-005.htm": [
+      {
+        "path": "css21_dev/html4/counters-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-005.htm"
+      }
+    ],
+    "css21_dev/html4/counters-006.htm": [
+      {
+        "path": "css21_dev/html4/counters-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-006.htm"
+      }
+    ],
+    "css21_dev/html4/counters-007.htm": [
+      {
+        "path": "css21_dev/html4/counters-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-007.htm"
+      }
+    ],
+    "css21_dev/html4/counters-008.htm": [
+      {
+        "path": "css21_dev/html4/counters-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-004-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-008.htm"
+      }
+    ],
+    "css21_dev/html4/counters-009.htm": [
+      {
+        "path": "css21_dev/html4/counters-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-003-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-009.htm"
+      }
+    ],
+    "css21_dev/html4/counters-010.htm": [
+      {
+        "path": "css21_dev/html4/counters-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/counters-010-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/counters-010.htm"
+      }
+    ],
+    "css21_dev/html4/declaration-001.htm": [
+      {
+        "path": "css21_dev/html4/declaration-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-001.htm"
+      }
+    ],
+    "css21_dev/html4/declaration-002.htm": [
+      {
+        "path": "css21_dev/html4/declaration-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-002.htm"
+      }
+    ],
+    "css21_dev/html4/declaration-003.htm": [
+      {
+        "path": "css21_dev/html4/declaration-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-003.htm"
+      }
+    ],
+    "css21_dev/html4/declaration-004.htm": [
+      {
+        "path": "css21_dev/html4/declaration-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-004.htm"
+      }
+    ],
+    "css21_dev/html4/declaration-005.htm": [
+      {
+        "path": "css21_dev/html4/declaration-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-005.htm"
+      }
+    ],
+    "css21_dev/html4/declaration-006.htm": [
+      {
+        "path": "css21_dev/html4/declaration-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declaration-006.htm"
+      }
+    ],
     "css21_dev/html4/declaration-whitespace-001.htm": [
       {
         "path": "css21_dev/html4/declaration-whitespace-001.htm",
@@ -502642,6 +510125,18 @@
         "url": "/css21_dev/html4/declaration-whitespace-001.htm"
       }
     ],
+    "css21_dev/html4/declarations-009.htm": [
+      {
+        "path": "css21_dev/html4/declarations-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/declarations-009-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/declarations-009.htm"
+      }
+    ],
     "css21_dev/html4/default-attribute-selector-001.htm": [
       {
         "path": "css21_dev/html4/default-attribute-selector-001.htm",
@@ -503686,6 +511181,198 @@
         "url": "/css21_dev/html4/escaped-ident-spaces-007.htm"
       }
     ],
+    "css21_dev/html4/escaped-newline-001.htm": [
+      {
+        "path": "css21_dev/html4/escaped-newline-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/escaped-newline-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escaped-newline-001.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-000.htm": [
+      {
+        "path": "css21_dev/html4/escapes-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/escapes-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-000.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-001.htm": [
+      {
+        "path": "css21_dev/html4/escapes-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-001.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-002.htm": [
+      {
+        "path": "css21_dev/html4/escapes-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-002.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-003.htm": [
+      {
+        "path": "css21_dev/html4/escapes-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-003.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-004.htm": [
+      {
+        "path": "css21_dev/html4/escapes-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-004.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-005.htm": [
+      {
+        "path": "css21_dev/html4/escapes-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-005.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-006.htm": [
+      {
+        "path": "css21_dev/html4/escapes-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-006.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-007.htm": [
+      {
+        "path": "css21_dev/html4/escapes-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-007.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-008.htm": [
+      {
+        "path": "css21_dev/html4/escapes-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-008.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-009.htm": [
+      {
+        "path": "css21_dev/html4/escapes-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-009.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-010.htm": [
+      {
+        "path": "css21_dev/html4/escapes-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-010.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-011.htm": [
+      {
+        "path": "css21_dev/html4/escapes-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-011.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-012.htm": [
+      {
+        "path": "css21_dev/html4/escapes-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-012.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-013.htm": [
+      {
+        "path": "css21_dev/html4/escapes-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/escapes-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-013.htm"
+      }
+    ],
+    "css21_dev/html4/escapes-014.htm": [
+      {
+        "path": "css21_dev/html4/escapes-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/escapes-014.htm"
+      }
+    ],
     "css21_dev/html4/escapes-015.htm": [
       {
         "path": "css21_dev/html4/escapes-015.htm",
@@ -507254,6 +514941,54 @@
         "url": "/css21_dev/html4/font-family-invalid-characters-002.htm"
       }
     ],
+    "css21_dev/html4/font-family-invalid-characters-003.htm": [
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-003.htm"
+      }
+    ],
+    "css21_dev/html4/font-family-invalid-characters-004.htm": [
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-004.htm"
+      }
+    ],
+    "css21_dev/html4/font-family-invalid-characters-005.htm": [
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-005.htm"
+      }
+    ],
+    "css21_dev/html4/font-family-invalid-characters-006.htm": [
+      {
+        "path": "css21_dev/html4/font-family-invalid-characters-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/font-family-invalid-characters-006-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/font-family-invalid-characters-006.htm"
+      }
+    ],
     "css21_dev/html4/font-family-name-001.htm": [
       {
         "path": "css21_dev/html4/font-family-name-001.htm",
@@ -509870,6 +517605,174 @@
         "url": "/css21_dev/html4/id-selector-006.htm"
       }
     ],
+    "css21_dev/html4/ident-000.htm": [
+      {
+        "path": "css21_dev/html4/ident-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-000.htm"
+      }
+    ],
+    "css21_dev/html4/ident-001.htm": [
+      {
+        "path": "css21_dev/html4/ident-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-001.htm"
+      }
+    ],
+    "css21_dev/html4/ident-002.htm": [
+      {
+        "path": "css21_dev/html4/ident-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-002.htm"
+      }
+    ],
+    "css21_dev/html4/ident-003.htm": [
+      {
+        "path": "css21_dev/html4/ident-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-003.htm"
+      }
+    ],
+    "css21_dev/html4/ident-004.htm": [
+      {
+        "path": "css21_dev/html4/ident-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-004.htm"
+      }
+    ],
+    "css21_dev/html4/ident-005.htm": [
+      {
+        "path": "css21_dev/html4/ident-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-005.htm"
+      }
+    ],
+    "css21_dev/html4/ident-006.htm": [
+      {
+        "path": "css21_dev/html4/ident-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-006.htm"
+      }
+    ],
+    "css21_dev/html4/ident-007.htm": [
+      {
+        "path": "css21_dev/html4/ident-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-007.htm"
+      }
+    ],
+    "css21_dev/html4/ident-008.htm": [
+      {
+        "path": "css21_dev/html4/ident-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-008.htm"
+      }
+    ],
+    "css21_dev/html4/ident-009.htm": [
+      {
+        "path": "css21_dev/html4/ident-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-009.htm"
+      }
+    ],
+    "css21_dev/html4/ident-010.htm": [
+      {
+        "path": "css21_dev/html4/ident-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-010.htm"
+      }
+    ],
+    "css21_dev/html4/ident-011.htm": [
+      {
+        "path": "css21_dev/html4/ident-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-011.htm"
+      }
+    ],
+    "css21_dev/html4/ident-012.htm": [
+      {
+        "path": "css21_dev/html4/ident-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-012-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-012.htm"
+      }
+    ],
+    "css21_dev/html4/ident-013.htm": [
+      {
+        "path": "css21_dev/html4/ident-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-013.htm"
+      }
+    ],
     "css21_dev/html4/ident-014.htm": [
       {
         "path": "css21_dev/html4/ident-014.htm",
@@ -509942,6 +517845,18 @@
         "url": "/css21_dev/html4/ident-019.htm"
       }
     ],
+    "css21_dev/html4/ident-020.htm": [
+      {
+        "path": "css21_dev/html4/ident-020.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ident-000-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/ident-020.htm"
+      }
+    ],
     "css21_dev/html4/ignored-rules-001.htm": [
       {
         "path": "css21_dev/html4/ignored-rules-001.htm",
@@ -510026,6 +517941,30 @@
         "url": "/css21_dev/html4/ignored-rules-007.htm"
       }
     ],
+    "css21_dev/html4/import-000.htm": [
+      {
+        "path": "css21_dev/html4/import-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/import-000.htm"
+      }
+    ],
+    "css21_dev/html4/import-001.htm": [
+      {
+        "path": "css21_dev/html4/import-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/import-001.htm"
+      }
+    ],
     "css21_dev/html4/inherit-static-offset-001.htm": [
       {
         "path": "css21_dev/html4/inherit-static-offset-001.htm",
@@ -511658,6 +519597,30 @@
         "url": "/css21_dev/html4/invalid-decl-at-rule-002.htm"
       }
     ],
+    "css21_dev/html4/keywords-000.htm": [
+      {
+        "path": "css21_dev/html4/keywords-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/keywords-000.htm"
+      }
+    ],
+    "css21_dev/html4/keywords-001.htm": [
+      {
+        "path": "css21_dev/html4/keywords-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/keywords-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/keywords-001.htm"
+      }
+    ],
     "css21_dev/html4/lang-selector-002.htm": [
       {
         "path": "css21_dev/html4/lang-selector-002.htm",
@@ -513494,6 +521457,18 @@
         "url": "/css21_dev/html4/list-style-019.htm"
       }
     ],
+    "css21_dev/html4/list-style-020.htm": [
+      {
+        "path": "css21_dev/html4/list-style-020.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/list-style-020-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/list-style-020.htm"
+      }
+    ],
     "css21_dev/html4/list-style-021.htm": [
       {
         "path": "css21_dev/html4/list-style-021.htm",
@@ -518018,6 +525993,42 @@
         "url": "/css21_dev/html4/margin-top-applies-to-015.htm"
       }
     ],
+    "css21_dev/html4/matching-brackets-001.htm": [
+      {
+        "path": "css21_dev/html4/matching-brackets-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/matching-brackets-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/matching-brackets-001.htm"
+      }
+    ],
+    "css21_dev/html4/matching-brackets-002.htm": [
+      {
+        "path": "css21_dev/html4/matching-brackets-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/matching-brackets-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/matching-brackets-002.htm"
+      }
+    ],
+    "css21_dev/html4/matching-brackets-003.htm": [
+      {
+        "path": "css21_dev/html4/matching-brackets-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/matching-brackets-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/matching-brackets-003.htm"
+      }
+    ],
     "css21_dev/html4/max-height-001.htm": [
       {
         "path": "css21_dev/html4/max-height-001.htm",
@@ -522626,6 +530637,18 @@
         "url": "/css21_dev/html4/numbers-units-003.htm"
       }
     ],
+    "css21_dev/html4/numbers-units-004.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-filled-black-96px-square.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-004.htm"
+      }
+    ],
     "css21_dev/html4/numbers-units-005.htm": [
       {
         "path": "css21_dev/html4/numbers-units-005.htm",
@@ -522638,6 +530661,106 @@
         "url": "/css21_dev/html4/numbers-units-005.htm"
       }
     ],
+    "css21_dev/html4/numbers-units-006.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-006.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-filled-black-96px-square.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-006.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-007.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-007.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-007-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-007.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-009.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-009.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-009-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-009.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-010.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-010.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-010-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-010.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-011.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-011.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-011-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-011.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-012.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-012-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-012.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-013.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-013.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-013-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-013.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-015.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-014-ref-a.htm",
+            "=="
+          ],
+          [
+            "/css21_dev/html4/reference/numbers-units-014-ref-b.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-015.htm"
+      }
+    ],
     "css21_dev/html4/numbers-units-016.htm": [
       {
         "path": "css21_dev/html4/numbers-units-016.htm",
@@ -522662,6 +530785,42 @@
         "url": "/css21_dev/html4/numbers-units-017.htm"
       }
     ],
+    "css21_dev/html4/numbers-units-018.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-018.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-018-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-018.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-019.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-019.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-019-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-019.htm"
+      }
+    ],
+    "css21_dev/html4/numbers-units-021.htm": [
+      {
+        "path": "css21_dev/html4/numbers-units-021.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/numbers-units-021-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/numbers-units-021.htm"
+      }
+    ],
     "css21_dev/html4/other-attribute-001.htm": [
       {
         "path": "css21_dev/html4/other-attribute-001.htm",
@@ -528290,6 +536449,54 @@
         "url": "/css21_dev/html4/quoted-keywords-002.htm"
       }
     ],
+    "css21_dev/html4/quoted-string-001.htm": [
+      {
+        "path": "css21_dev/html4/quoted-string-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-001.htm"
+      }
+    ],
+    "css21_dev/html4/quoted-string-002.htm": [
+      {
+        "path": "css21_dev/html4/quoted-string-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-002.htm"
+      }
+    ],
+    "css21_dev/html4/quoted-string-003.htm": [
+      {
+        "path": "css21_dev/html4/quoted-string-003.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-003.htm"
+      }
+    ],
+    "css21_dev/html4/quoted-string-004.htm": [
+      {
+        "path": "css21_dev/html4/quoted-string-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/quoted-string-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/quoted-string-004.htm"
+      }
+    ],
     "css21_dev/html4/quotes-035.htm": [
       {
         "path": "css21_dev/html4/quotes-035.htm",
@@ -531478,6 +539685,18 @@
         "url": "/css21_dev/html4/run-in-text-between-005.htm"
       }
     ],
+    "css21_dev/html4/selectors-parsing-001.htm": [
+      {
+        "path": "css21_dev/html4/selectors-parsing-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/selectors-parsing-001-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/selectors-parsing-001.htm"
+      }
+    ],
     "css21_dev/html4/separated-border-model-003a.htm": [
       {
         "path": "css21_dev/html4/separated-border-model-003a.htm",
@@ -531598,6 +539817,18 @@
         "url": "/css21_dev/html4/separated-border-model-009.htm"
       }
     ],
+    "css21_dev/html4/sgml-comments-000.htm": [
+      {
+        "path": "css21_dev/html4/sgml-comments-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/sgml-comments-000.htm"
+      }
+    ],
     "css21_dev/html4/sgml-comments-001.htm": [
       {
         "path": "css21_dev/html4/sgml-comments-001.htm",
@@ -531610,6 +539841,18 @@
         "url": "/css21_dev/html4/sgml-comments-001.htm"
       }
     ],
+    "css21_dev/html4/sgml-comments-002.htm": [
+      {
+        "path": "css21_dev/html4/sgml-comments-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/sgml-comments-002-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/sgml-comments-002.htm"
+      }
+    ],
     "css21_dev/html4/shand-border-000.htm": [
       {
         "path": "css21_dev/html4/shand-border-000.htm",
@@ -531874,6 +540117,18 @@
         "url": "/css21_dev/html4/stack-floats-004.htm"
       }
     ],
+    "css21_dev/html4/strings-000.htm": [
+      {
+        "path": "css21_dev/html4/strings-000.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/strings-000.htm"
+      }
+    ],
     "css21_dev/html4/style-attr-cascade-001.htm": [
       {
         "path": "css21_dev/html4/style-attr-cascade-001.htm",
@@ -533826,6 +542081,18 @@
         "url": "/css21_dev/html4/units-004.htm"
       }
     ],
+    "css21_dev/html4/units-005.htm": [
+      {
+        "path": "css21_dev/html4/units-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/units-005-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/units-005.htm"
+      }
+    ],
     "css21_dev/html4/units-006.htm": [
       {
         "path": "css21_dev/html4/units-006.htm",
@@ -533886,6 +542153,18 @@
         "url": "/css21_dev/html4/universal-selector-004.htm"
       }
     ],
+    "css21_dev/html4/unterminated-string-001.htm": [
+      {
+        "path": "css21_dev/html4/unterminated-string-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/filler-text-below-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/unterminated-string-001.htm"
+      }
+    ],
     "css21_dev/html4/uri-001.htm": [
       {
         "path": "css21_dev/html4/uri-001.htm",
@@ -533922,6 +542201,30 @@
         "url": "/css21_dev/html4/uri-003.htm"
       }
     ],
+    "css21_dev/html4/uri-004.htm": [
+      {
+        "path": "css21_dev/html4/uri-004.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-004.htm"
+      }
+    ],
+    "css21_dev/html4/uri-005.htm": [
+      {
+        "path": "css21_dev/html4/uri-005.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-005.htm"
+      }
+    ],
     "css21_dev/html4/uri-006.htm": [
       {
         "path": "css21_dev/html4/uri-006.htm",
@@ -533994,6 +542297,18 @@
         "url": "/css21_dev/html4/uri-011.htm"
       }
     ],
+    "css21_dev/html4/uri-012.htm": [
+      {
+        "path": "css21_dev/html4/uri-012.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/uri-012-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-012.htm"
+      }
+    ],
     "css21_dev/html4/uri-013.htm": [
       {
         "path": "css21_dev/html4/uri-013.htm",
@@ -534006,6 +542321,66 @@
         "url": "/css21_dev/html4/uri-013.htm"
       }
     ],
+    "css21_dev/html4/uri-014.htm": [
+      {
+        "path": "css21_dev/html4/uri-014.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-014.htm"
+      }
+    ],
+    "css21_dev/html4/uri-015.htm": [
+      {
+        "path": "css21_dev/html4/uri-015.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-green-background.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-015.htm"
+      }
+    ],
+    "css21_dev/html4/uri-016.htm": [
+      {
+        "path": "css21_dev/html4/uri-016.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/uri-016-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-016.htm"
+      }
+    ],
+    "css21_dev/html4/uri-017.htm": [
+      {
+        "path": "css21_dev/html4/uri-017.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/uri-017-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-017.htm"
+      }
+    ],
+    "css21_dev/html4/uri-018.htm": [
+      {
+        "path": "css21_dev/html4/uri-018.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/uri-018.htm"
+      }
+    ],
     "css21_dev/html4/vertical-align-004.htm": [
       {
         "path": "css21_dev/html4/vertical-align-004.htm",
@@ -535242,6 +543617,30 @@
         "url": "/css21_dev/html4/white-space-processing-049.htm"
       }
     ],
+    "css21_dev/html4/whitespace-001.htm": [
+      {
+        "path": "css21_dev/html4/whitespace-001.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/no-red-filler-text-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/whitespace-001.htm"
+      }
+    ],
+    "css21_dev/html4/whitespace-002.htm": [
+      {
+        "path": "css21_dev/html4/whitespace-002.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/no-red-filler-text-ref.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/whitespace-002.htm"
+      }
+    ],
     "css21_dev/html4/width-001.htm": [
       {
         "path": "css21_dev/html4/width-001.htm",
@@ -541842,6 +550241,294 @@
         "url": "/css21_dev/xhtml1/anonymous-table-box-width-001.xht"
       }
     ],
+    "css21_dev/xhtml1/at-charset-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/at-charset-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-011.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-014.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-014.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-015.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-015.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-016.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-016.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-019.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-019.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-020.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-020.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-021.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-021.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-024.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-024.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-024.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-025.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-025.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-025.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-026.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-026.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-026.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-027.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-027.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-027.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-028.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-028.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-028.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-029.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-029.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-029.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-030.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-030.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-030.xht"
+      }
+    ],
     "css21_dev/xhtml1/at-charset-033.xht": [
       {
         "path": "css21_dev/xhtml1/at-charset-033.xht",
@@ -541914,6 +550601,114 @@
         "url": "/css21_dev/xhtml1/at-charset-038.xht"
       }
     ],
+    "css21_dev/xhtml1/at-charset-040.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-040.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-040.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-041.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-041.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-041.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-042.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-042.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-042.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-043.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-043.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-043.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-044.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-044.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-044.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-045.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-045.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-045.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-046.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-046.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-046.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-047.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-047.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-047.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-048.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-048.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-048.xht"
+      }
+    ],
     "css21_dev/xhtml1/at-charset-049.xht": [
       {
         "path": "css21_dev/xhtml1/at-charset-049.xht",
@@ -541974,6 +550769,18 @@
         "url": "/css21_dev/xhtml1/at-charset-053.xht"
       }
     ],
+    "css21_dev/xhtml1/at-charset-054.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-054.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-054.xht"
+      }
+    ],
     "css21_dev/xhtml1/at-charset-055.xht": [
       {
         "path": "css21_dev/xhtml1/at-charset-055.xht",
@@ -541986,6 +550793,18 @@
         "url": "/css21_dev/xhtml1/at-charset-055.xht"
       }
     ],
+    "css21_dev/xhtml1/at-charset-056.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-056.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-056.xht"
+      }
+    ],
     "css21_dev/xhtml1/at-charset-057.xht": [
       {
         "path": "css21_dev/xhtml1/at-charset-057.xht",
@@ -542022,6 +550841,114 @@
         "url": "/css21_dev/xhtml1/at-charset-059.xht"
       }
     ],
+    "css21_dev/xhtml1/at-charset-060.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-060.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-060.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-061.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-061.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-061.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-071.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-071.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-071.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-072.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-072.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-072.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-073.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-073.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-073.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-074.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-074.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-074.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-075.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-075.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-075.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-076.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-076.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-076.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-charset-077.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-charset-077.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-charset-077.xht"
+      }
+    ],
     "css21_dev/xhtml1/at-charset-quotes-001.xht": [
       {
         "path": "css21_dev/xhtml1/at-charset-quotes-001.xht",
@@ -542202,6 +551129,78 @@
         "url": "/css21_dev/xhtml1/at-import-007.xht"
       }
     ],
+    "css21_dev/xhtml1/at-import-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-import-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-import-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-import-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-import-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-import-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-import-011.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-import-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-import-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-keywords-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-keywords-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-keywords-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-keywords-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-keywords-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-keywords-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-keywords-002.xht"
+      }
+    ],
     "css21_dev/xhtml1/at-rule-001.xht": [
       {
         "path": "css21_dev/xhtml1/at-rule-001.xht",
@@ -542346,6 +551345,78 @@
         "url": "/css21_dev/xhtml1/at-rule-012.xht"
       }
     ],
+    "css21_dev/xhtml1/at-rule-013.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-rule-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/at-rule-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rule-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-rules-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-rules-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-rules-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-rules-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-rules-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-rules-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-rules-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-rules-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/at-rules-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/at-rules-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/at-rules-004.xht"
+      }
+    ],
     "css21_dev/xhtml1/attribute-selector-001.xht": [
       {
         "path": "css21_dev/xhtml1/attribute-selector-001.xht",
@@ -542370,6 +551441,18 @@
         "url": "/css21_dev/xhtml1/attribute-selector-002.xht"
       }
     ],
+    "css21_dev/xhtml1/attribute-token-selector-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/attribute-token-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/attribute-token-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/attribute-token-selector-002.xht"
+      }
+    ],
     "css21_dev/xhtml1/attribute-value-selector-004.xht": [
       {
         "path": "css21_dev/xhtml1/attribute-value-selector-004.xht",
@@ -550502,6 +559585,18 @@
         "url": "/css21_dev/xhtml1/block-replaced-width-006.xht"
       }
     ],
+    "css21_dev/xhtml1/blocks-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/blocks-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/blocks-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/blocks-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/blocks-002.xht": [
       {
         "path": "css21_dev/xhtml1/blocks-002.xht",
@@ -565950,6 +575045,18 @@
         "url": "/css21_dev/xhtml1/c544-valgn-001.xht"
       }
     ],
+    "css21_dev/xhtml1/c547-indent-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/c547-indent-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/c547-indent-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/c547-indent-000.xht"
+      }
+    ],
     "css21_dev/xhtml1/c547-indent-001.xht": [
       {
         "path": "css21_dev/xhtml1/c547-indent-001.xht",
@@ -566694,6 +575801,18 @@
         "url": "/css21_dev/xhtml1/c5510-ipadn-000.xht"
       }
     ],
+    "css21_dev/xhtml1/c5510-padn-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/c5510-padn-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/c5510-padn-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/c5510-padn-000.xht"
+      }
+    ],
     "css21_dev/xhtml1/c5510-padn-001.xht": [
       {
         "path": "css21_dev/xhtml1/c5510-padn-001.xht",
@@ -567282,6 +576401,162 @@
         "url": "/css21_dev/xhtml1/cascade-012.xht"
       }
     ],
+    "css21_dev/xhtml1/cascade-import-dynamic-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/cascade-import-dynamic-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/cascade-import-dynamic-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/cascade-import-dynamic-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/cascade-import-dynamic-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/cascade-import-dynamic-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/cascade-import-dynamic-control.xht": [
+      {
+        "path": "css21_dev/xhtml1/cascade-import-dynamic-control.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/cascade-import-dynamic-control.xht"
+      }
+    ],
+    "css21_dev/xhtml1/case-sensitive-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/case-sensitive-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/case-sensitive-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/case-sensitive-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/case-sensitive-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/case-sensitive-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/case-sensitive-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/case-sensitive-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/case-sensitive-007.xht"
+      }
+    ],
     "css21_dev/xhtml1/charset-attr-001.xht": [
       {
         "path": "css21_dev/xhtml1/charset-attr-001.xht",
@@ -568410,6 +577685,18 @@
         "url": "/css21_dev/xhtml1/collapsing-border-model-010b.xht"
       }
     ],
+    "css21_dev/xhtml1/color-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/color-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/color-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/color-000.xht"
+      }
+    ],
     "css21_dev/xhtml1/color-001.xht": [
       {
         "path": "css21_dev/xhtml1/color-001.xht",
@@ -570306,6 +579593,18 @@
         "url": "/css21_dev/xhtml1/colors-005.xht"
       }
     ],
+    "css21_dev/xhtml1/colors-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/colors-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/colors-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/colors-006.xht"
+      }
+    ],
     "css21_dev/xhtml1/colors-007.xht": [
       {
         "path": "css21_dev/xhtml1/colors-007.xht",
@@ -570822,6 +580121,210 @@
         "url": "/css21_dev/xhtml1/content-177.xht"
       }
     ],
+    "css21_dev/xhtml1/content-counter-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-008-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-011.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-012.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-013.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-014.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-014.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-015.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-015-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-015.xht"
+      }
+    ],
+    "css21_dev/xhtml1/content-counter-016.xht": [
+      {
+        "path": "css21_dev/xhtml1/content-counter-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/content-counter-016.xht"
+      }
+    ],
     "css21_dev/xhtml1/content-inherit-002.xht": [
       {
         "path": "css21_dev/xhtml1/content-inherit-002.xht",
@@ -570858,6 +580361,102 @@
         "url": "/css21_dev/xhtml1/content-type-001.xht"
       }
     ],
+    "css21_dev/xhtml1/core-syntax-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/core-syntax-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1/core-syntax-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/core-syntax-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/core-syntax-009.xht"
+      }
+    ],
     "css21_dev/xhtml1/counter-reset-increment-002.xht": [
       {
         "path": "css21_dev/xhtml1/counter-reset-increment-002.xht",
@@ -570870,6 +580469,18 @@
         "url": "/css21_dev/xhtml1/counter-reset-increment-002.xht"
       }
     ],
+    "css21_dev/xhtml1/counters-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/counters-002.xht": [
       {
         "path": "css21_dev/xhtml1/counters-002.xht",
@@ -570882,6 +580493,174 @@
         "url": "/css21_dev/xhtml1/counters-002.xht"
       }
     ],
+    "css21_dev/xhtml1/counters-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/counters-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/counters-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/counters-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/counters-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/declaration-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/declaration-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/declaration-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/declaration-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/declaration-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/declaration-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/declaration-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/declaration-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/declaration-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/declaration-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/declaration-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/declaration-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declaration-006.xht"
+      }
+    ],
     "css21_dev/xhtml1/declaration-whitespace-001.xht": [
       {
         "path": "css21_dev/xhtml1/declaration-whitespace-001.xht",
@@ -570894,6 +580673,18 @@
         "url": "/css21_dev/xhtml1/declaration-whitespace-001.xht"
       }
     ],
+    "css21_dev/xhtml1/declarations-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/declarations-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/declarations-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/declarations-009.xht"
+      }
+    ],
     "css21_dev/xhtml1/default-attribute-selector-001.xht": [
       {
         "path": "css21_dev/xhtml1/default-attribute-selector-001.xht",
@@ -571902,6 +581693,198 @@
         "url": "/css21_dev/xhtml1/escaped-ident-spaces-007.xht"
       }
     ],
+    "css21_dev/xhtml1/escaped-newline-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/escaped-newline-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/escaped-newline-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escaped-newline-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/escapes-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-011.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-012.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-013.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/escapes-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1/escapes-014.xht": [
+      {
+        "path": "css21_dev/xhtml1/escapes-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/escapes-014.xht"
+      }
+    ],
     "css21_dev/xhtml1/escapes-015.xht": [
       {
         "path": "css21_dev/xhtml1/escapes-015.xht",
@@ -575302,6 +585285,54 @@
         "url": "/css21_dev/xhtml1/font-family-invalid-characters-002.xht"
       }
     ],
+    "css21_dev/xhtml1/font-family-invalid-characters-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/font-family-invalid-characters-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/font-family-invalid-characters-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/font-family-invalid-characters-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/font-family-invalid-characters-006.xht"
+      }
+    ],
     "css21_dev/xhtml1/font-family-name-001.xht": [
       {
         "path": "css21_dev/xhtml1/font-family-name-001.xht",
@@ -577870,6 +587901,174 @@
         "url": "/css21_dev/xhtml1/id-selector-006.xht"
       }
     ],
+    "css21_dev/xhtml1/ident-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-011.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-012.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1/ident-013.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-013.xht"
+      }
+    ],
     "css21_dev/xhtml1/ident-014.xht": [
       {
         "path": "css21_dev/xhtml1/ident-014.xht",
@@ -577942,6 +588141,18 @@
         "url": "/css21_dev/xhtml1/ident-019.xht"
       }
     ],
+    "css21_dev/xhtml1/ident-020.xht": [
+      {
+        "path": "css21_dev/xhtml1/ident-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/ident-020.xht"
+      }
+    ],
     "css21_dev/xhtml1/ignored-rules-001.xht": [
       {
         "path": "css21_dev/xhtml1/ignored-rules-001.xht",
@@ -578026,6 +588237,30 @@
         "url": "/css21_dev/xhtml1/ignored-rules-007.xht"
       }
     ],
+    "css21_dev/xhtml1/import-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/import-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/import-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/import-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/import-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/import-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/inherit-static-offset-001.xht": [
       {
         "path": "css21_dev/xhtml1/inherit-static-offset-001.xht",
@@ -579754,6 +589989,30 @@
         "url": "/css21_dev/xhtml1/invalid-decl-at-rule-002.xht"
       }
     ],
+    "css21_dev/xhtml1/keywords-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/keywords-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1/keywords-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/keywords-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/keywords-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/lang-selector-002.xht": [
       {
         "path": "css21_dev/xhtml1/lang-selector-002.xht",
@@ -581434,6 +591693,18 @@
         "url": "/css21_dev/xhtml1/line-height-bleed-002.xht"
       }
     ],
+    "css21_dev/xhtml1/list-style-020.xht": [
+      {
+        "path": "css21_dev/xhtml1/list-style-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/list-style-020-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/list-style-020.xht"
+      }
+    ],
     "css21_dev/xhtml1/list-style-image-004.xht": [
       {
         "path": "css21_dev/xhtml1/list-style-image-004.xht",
@@ -585934,6 +596205,42 @@
         "url": "/css21_dev/xhtml1/margin-top-applies-to-015.xht"
       }
     ],
+    "css21_dev/xhtml1/matching-brackets-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/matching-brackets-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/matching-brackets-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/matching-brackets-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/matching-brackets-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/matching-brackets-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/matching-brackets-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/matching-brackets-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/matching-brackets-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/matching-brackets-003.xht"
+      }
+    ],
     "css21_dev/xhtml1/max-height-001.xht": [
       {
         "path": "css21_dev/xhtml1/max-height-001.xht",
@@ -590542,6 +600849,18 @@
         "url": "/css21_dev/xhtml1/numbers-units-003.xht"
       }
     ],
+    "css21_dev/xhtml1/numbers-units-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-004.xht"
+      }
+    ],
     "css21_dev/xhtml1/numbers-units-005.xht": [
       {
         "path": "css21_dev/xhtml1/numbers-units-005.xht",
@@ -590554,6 +600873,106 @@
         "url": "/css21_dev/xhtml1/numbers-units-005.xht"
       }
     ],
+    "css21_dev/xhtml1/numbers-units-006.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-007.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-009.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-010.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-011.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-012.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-013.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-015.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-014-ref-a.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-014-ref-b.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-015.xht"
+      }
+    ],
     "css21_dev/xhtml1/numbers-units-016.xht": [
       {
         "path": "css21_dev/xhtml1/numbers-units-016.xht",
@@ -590578,6 +600997,42 @@
         "url": "/css21_dev/xhtml1/numbers-units-017.xht"
       }
     ],
+    "css21_dev/xhtml1/numbers-units-018.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-018-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-018.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-019.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-019-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-019.xht"
+      }
+    ],
+    "css21_dev/xhtml1/numbers-units-021.xht": [
+      {
+        "path": "css21_dev/xhtml1/numbers-units-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/numbers-units-021-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/numbers-units-021.xht"
+      }
+    ],
     "css21_dev/xhtml1/other-attribute-001.xht": [
       {
         "path": "css21_dev/xhtml1/other-attribute-001.xht",
@@ -596170,6 +606625,54 @@
         "url": "/css21_dev/xhtml1/quoted-keywords-002.xht"
       }
     ],
+    "css21_dev/xhtml1/quoted-string-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/quoted-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/quoted-string-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/quoted-string-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1/quoted-string-003.xht": [
+      {
+        "path": "css21_dev/xhtml1/quoted-string-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1/quoted-string-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/quoted-string-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/quoted-string-004.xht"
+      }
+    ],
     "css21_dev/xhtml1/quotes-035.xht": [
       {
         "path": "css21_dev/xhtml1/quotes-035.xht",
@@ -599346,6 +609849,18 @@
         "url": "/css21_dev/xhtml1/run-in-text-between-005.xht"
       }
     ],
+    "css21_dev/xhtml1/selectors-parsing-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/selectors-parsing-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/selectors-parsing-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/selectors-parsing-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/separated-border-model-003a.xht": [
       {
         "path": "css21_dev/xhtml1/separated-border-model-003a.xht",
@@ -599466,6 +609981,18 @@
         "url": "/css21_dev/xhtml1/separated-border-model-009.xht"
       }
     ],
+    "css21_dev/xhtml1/sgml-comments-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/sgml-comments-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/sgml-comments-000.xht"
+      }
+    ],
     "css21_dev/xhtml1/sgml-comments-001.xht": [
       {
         "path": "css21_dev/xhtml1/sgml-comments-001.xht",
@@ -599478,6 +610005,18 @@
         "url": "/css21_dev/xhtml1/sgml-comments-001.xht"
       }
     ],
+    "css21_dev/xhtml1/sgml-comments-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/sgml-comments-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/sgml-comments-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/sgml-comments-002.xht"
+      }
+    ],
     "css21_dev/xhtml1/shand-border-000.xht": [
       {
         "path": "css21_dev/xhtml1/shand-border-000.xht",
@@ -599742,6 +610281,18 @@
         "url": "/css21_dev/xhtml1/stack-floats-004.xht"
       }
     ],
+    "css21_dev/xhtml1/strings-000.xht": [
+      {
+        "path": "css21_dev/xhtml1/strings-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/strings-000.xht"
+      }
+    ],
     "css21_dev/xhtml1/style-attr-cascade-001.xht": [
       {
         "path": "css21_dev/xhtml1/style-attr-cascade-001.xht",
@@ -601658,6 +612209,18 @@
         "url": "/css21_dev/xhtml1/units-004.xht"
       }
     ],
+    "css21_dev/xhtml1/units-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/units-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/units-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/units-005.xht"
+      }
+    ],
     "css21_dev/xhtml1/units-006.xht": [
       {
         "path": "css21_dev/xhtml1/units-006.xht",
@@ -601718,6 +612281,18 @@
         "url": "/css21_dev/xhtml1/universal-selector-004.xht"
       }
     ],
+    "css21_dev/xhtml1/unterminated-string-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/unterminated-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/unterminated-string-001.xht"
+      }
+    ],
     "css21_dev/xhtml1/uri-001.xht": [
       {
         "path": "css21_dev/xhtml1/uri-001.xht",
@@ -601754,6 +612329,30 @@
         "url": "/css21_dev/xhtml1/uri-003.xht"
       }
     ],
+    "css21_dev/xhtml1/uri-004.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1/uri-005.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-005.xht"
+      }
+    ],
     "css21_dev/xhtml1/uri-006.xht": [
       {
         "path": "css21_dev/xhtml1/uri-006.xht",
@@ -601826,6 +612425,18 @@
         "url": "/css21_dev/xhtml1/uri-011.xht"
       }
     ],
+    "css21_dev/xhtml1/uri-012.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/uri-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-012.xht"
+      }
+    ],
     "css21_dev/xhtml1/uri-013.xht": [
       {
         "path": "css21_dev/xhtml1/uri-013.xht",
@@ -601838,6 +612449,66 @@
         "url": "/css21_dev/xhtml1/uri-013.xht"
       }
     ],
+    "css21_dev/xhtml1/uri-014.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-014.xht"
+      }
+    ],
+    "css21_dev/xhtml1/uri-015.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-015.xht"
+      }
+    ],
+    "css21_dev/xhtml1/uri-016.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/uri-016-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-016.xht"
+      }
+    ],
+    "css21_dev/xhtml1/uri-017.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-017.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/uri-017-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-017.xht"
+      }
+    ],
+    "css21_dev/xhtml1/uri-018.xht": [
+      {
+        "path": "css21_dev/xhtml1/uri-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/uri-018.xht"
+      }
+    ],
     "css21_dev/xhtml1/vertical-align-004.xht": [
       {
         "path": "css21_dev/xhtml1/vertical-align-004.xht",
@@ -603050,6 +613721,30 @@
         "url": "/css21_dev/xhtml1/white-space-processing-049.xht"
       }
     ],
+    "css21_dev/xhtml1/whitespace-001.xht": [
+      {
+        "path": "css21_dev/xhtml1/whitespace-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/whitespace-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1/whitespace-002.xht": [
+      {
+        "path": "css21_dev/xhtml1/whitespace-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/whitespace-002.xht"
+      }
+    ],
     "css21_dev/xhtml1/width-001.xht": [
       {
         "path": "css21_dev/xhtml1/width-001.xht",
@@ -609650,6 +620345,294 @@
         "url": "/css21_dev/xhtml1print/anonymous-table-box-width-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-charset-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/at-charset-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-011.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-014.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-014.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-015.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-015.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-016.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-016.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-019.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-019.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-020.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-020.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-021.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-021.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-024.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-024.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-024.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-025.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-025.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-025.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-026.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-026.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-026.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-027.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-027.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-027.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-028.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-028.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-028.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-029.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-029.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-029.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-030.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-030.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-030.xht"
+      }
+    ],
     "css21_dev/xhtml1print/at-charset-033.xht": [
       {
         "path": "css21_dev/xhtml1print/at-charset-033.xht",
@@ -609722,6 +620705,114 @@
         "url": "/css21_dev/xhtml1print/at-charset-038.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-charset-040.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-040.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-040.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-041.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-041.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-041.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-042.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-042.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-042.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-043.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-043.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-043.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-044.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-044.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-044.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-045.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-045.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-045.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-046.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-046.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-046.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-047.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-047.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-047.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-048.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-048.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-048.xht"
+      }
+    ],
     "css21_dev/xhtml1print/at-charset-049.xht": [
       {
         "path": "css21_dev/xhtml1print/at-charset-049.xht",
@@ -609782,6 +620873,18 @@
         "url": "/css21_dev/xhtml1print/at-charset-053.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-charset-054.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-054.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-054.xht"
+      }
+    ],
     "css21_dev/xhtml1print/at-charset-055.xht": [
       {
         "path": "css21_dev/xhtml1print/at-charset-055.xht",
@@ -609794,6 +620897,18 @@
         "url": "/css21_dev/xhtml1print/at-charset-055.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-charset-056.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-056.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-056.xht"
+      }
+    ],
     "css21_dev/xhtml1print/at-charset-057.xht": [
       {
         "path": "css21_dev/xhtml1print/at-charset-057.xht",
@@ -609830,6 +620945,114 @@
         "url": "/css21_dev/xhtml1print/at-charset-059.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-charset-060.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-060.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/at-charset-001.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-060.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-061.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-061.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-061.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-071.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-071.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-071.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-072.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-072.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-072.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-073.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-073.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-073.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-074.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-074.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-074.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-075.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-075.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-075.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-076.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-076.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-076.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-charset-077.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-charset-077.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-charset-077.xht"
+      }
+    ],
     "css21_dev/xhtml1print/at-charset-quotes-001.xht": [
       {
         "path": "css21_dev/xhtml1print/at-charset-quotes-001.xht",
@@ -610010,6 +621233,78 @@
         "url": "/css21_dev/xhtml1print/at-import-007.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-import-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-import-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-import-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-import-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-import-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-import-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-import-011.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-import-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-import-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-keywords-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-keywords-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-keywords-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-keywords-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-keywords-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-keywords-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-keywords-002.xht"
+      }
+    ],
     "css21_dev/xhtml1print/at-rule-001.xht": [
       {
         "path": "css21_dev/xhtml1print/at-rule-001.xht",
@@ -610154,6 +621449,78 @@
         "url": "/css21_dev/xhtml1print/at-rule-012.xht"
       }
     ],
+    "css21_dev/xhtml1print/at-rule-013.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-rule-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/at-rule-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rule-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-rules-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-rules-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-rules-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-rules-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-rules-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-rules-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-rules-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-rules-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/at-rules-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/at-rules-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/at-rules-004.xht"
+      }
+    ],
     "css21_dev/xhtml1print/attribute-selector-001.xht": [
       {
         "path": "css21_dev/xhtml1print/attribute-selector-001.xht",
@@ -610178,6 +621545,18 @@
         "url": "/css21_dev/xhtml1print/attribute-selector-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/attribute-token-selector-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/attribute-token-selector-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/attribute-token-selector-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/attribute-token-selector-002.xht"
+      }
+    ],
     "css21_dev/xhtml1print/attribute-value-selector-004.xht": [
       {
         "path": "css21_dev/xhtml1print/attribute-value-selector-004.xht",
@@ -618310,6 +629689,18 @@
         "url": "/css21_dev/xhtml1print/block-replaced-width-006.xht"
       }
     ],
+    "css21_dev/xhtml1print/blocks-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/blocks-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/blocks-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/blocks-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/blocks-002.xht": [
       {
         "path": "css21_dev/xhtml1print/blocks-002.xht",
@@ -633758,6 +645149,18 @@
         "url": "/css21_dev/xhtml1print/c544-valgn-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/c547-indent-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/c547-indent-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/c547-indent-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/c547-indent-000.xht"
+      }
+    ],
     "css21_dev/xhtml1print/c547-indent-001.xht": [
       {
         "path": "css21_dev/xhtml1print/c547-indent-001.xht",
@@ -634502,6 +645905,18 @@
         "url": "/css21_dev/xhtml1print/c5510-ipadn-000.xht"
       }
     ],
+    "css21_dev/xhtml1print/c5510-padn-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/c5510-padn-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/c5510-padn-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/c5510-padn-000.xht"
+      }
+    ],
     "css21_dev/xhtml1print/c5510-padn-001.xht": [
       {
         "path": "css21_dev/xhtml1print/c5510-padn-001.xht",
@@ -635090,6 +646505,162 @@
         "url": "/css21_dev/xhtml1print/cascade-012.xht"
       }
     ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/cascade-import-dynamic-control.xht": [
+      {
+        "path": "css21_dev/xhtml1print/cascade-import-dynamic-control.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/cascade-import-dynamic-control.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/case-sensitive-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/case-sensitive-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/case-sensitive-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/case-sensitive-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/case-sensitive-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/case-sensitive-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/case-sensitive-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/case-sensitive-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/case-sensitive-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/case-sensitive-007.xht"
+      }
+    ],
     "css21_dev/xhtml1print/charset-attr-001.xht": [
       {
         "path": "css21_dev/xhtml1print/charset-attr-001.xht",
@@ -636218,6 +647789,18 @@
         "url": "/css21_dev/xhtml1print/collapsing-border-model-010b.xht"
       }
     ],
+    "css21_dev/xhtml1print/color-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/color-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/color-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/color-000.xht"
+      }
+    ],
     "css21_dev/xhtml1print/color-001.xht": [
       {
         "path": "css21_dev/xhtml1print/color-001.xht",
@@ -638114,6 +649697,18 @@
         "url": "/css21_dev/xhtml1print/colors-005.xht"
       }
     ],
+    "css21_dev/xhtml1print/colors-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/colors-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/colors-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/colors-006.xht"
+      }
+    ],
     "css21_dev/xhtml1print/colors-007.xht": [
       {
         "path": "css21_dev/xhtml1print/colors-007.xht",
@@ -638630,6 +650225,210 @@
         "url": "/css21_dev/xhtml1print/content-177.xht"
       }
     ],
+    "css21_dev/xhtml1print/content-counter-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-008-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-011.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-012.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-013.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-014.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-014.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-015.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-015-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-015.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/content-counter-016.xht": [
+      {
+        "path": "css21_dev/xhtml1print/content-counter-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/content-counter-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/content-counter-016.xht"
+      }
+    ],
     "css21_dev/xhtml1print/content-inherit-002.xht": [
       {
         "path": "css21_dev/xhtml1print/content-inherit-002.xht",
@@ -638666,6 +650465,102 @@
         "url": "/css21_dev/xhtml1print/content-type-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/core-syntax-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/core-syntax-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/core-syntax-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/core-syntax-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/core-syntax-009.xht"
+      }
+    ],
     "css21_dev/xhtml1print/counter-reset-increment-002.xht": [
       {
         "path": "css21_dev/xhtml1print/counter-reset-increment-002.xht",
@@ -638678,6 +650573,18 @@
         "url": "/css21_dev/xhtml1print/counter-reset-increment-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/counters-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/counters-002.xht": [
       {
         "path": "css21_dev/xhtml1print/counters-002.xht",
@@ -638690,6 +650597,174 @@
         "url": "/css21_dev/xhtml1print/counters-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/counters-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-004-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-003-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/counters-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/counters-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/counters-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/counters-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/declaration-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declaration-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/declaration-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declaration-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/declaration-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declaration-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/declaration-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declaration-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/declaration-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declaration-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/declaration-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declaration-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declaration-006.xht"
+      }
+    ],
     "css21_dev/xhtml1print/declaration-whitespace-001.xht": [
       {
         "path": "css21_dev/xhtml1print/declaration-whitespace-001.xht",
@@ -638702,6 +650777,18 @@
         "url": "/css21_dev/xhtml1print/declaration-whitespace-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/declarations-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/declarations-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/declarations-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/declarations-009.xht"
+      }
+    ],
     "css21_dev/xhtml1print/default-attribute-selector-001.xht": [
       {
         "path": "css21_dev/xhtml1print/default-attribute-selector-001.xht",
@@ -639710,6 +651797,198 @@
         "url": "/css21_dev/xhtml1print/escaped-ident-spaces-007.xht"
       }
     ],
+    "css21_dev/xhtml1print/escaped-newline-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escaped-newline-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/escaped-newline-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escaped-newline-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/escapes-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-011.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-012.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-013.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/escapes-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/escapes-014.xht": [
+      {
+        "path": "css21_dev/xhtml1print/escapes-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/escapes-014.xht"
+      }
+    ],
     "css21_dev/xhtml1print/escapes-015.xht": [
       {
         "path": "css21_dev/xhtml1print/escapes-015.xht",
@@ -643110,6 +655389,54 @@
         "url": "/css21_dev/xhtml1print/font-family-invalid-characters-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/font-family-invalid-characters-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/font-family-invalid-characters-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/font-family-invalid-characters-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/font-family-invalid-characters-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/font-family-invalid-characters-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/font-family-invalid-characters-006-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/font-family-invalid-characters-006.xht"
+      }
+    ],
     "css21_dev/xhtml1print/font-family-name-001.xht": [
       {
         "path": "css21_dev/xhtml1print/font-family-name-001.xht",
@@ -645678,6 +658005,174 @@
         "url": "/css21_dev/xhtml1print/id-selector-006.xht"
       }
     ],
+    "css21_dev/xhtml1print/ident-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-005.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-008.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-011.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-012.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/ident-013.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-013.xht"
+      }
+    ],
     "css21_dev/xhtml1print/ident-014.xht": [
       {
         "path": "css21_dev/xhtml1print/ident-014.xht",
@@ -645750,6 +658245,18 @@
         "url": "/css21_dev/xhtml1print/ident-019.xht"
       }
     ],
+    "css21_dev/xhtml1print/ident-020.xht": [
+      {
+        "path": "css21_dev/xhtml1print/ident-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ident-000-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/ident-020.xht"
+      }
+    ],
     "css21_dev/xhtml1print/ignored-rules-001.xht": [
       {
         "path": "css21_dev/xhtml1print/ignored-rules-001.xht",
@@ -645834,6 +658341,30 @@
         "url": "/css21_dev/xhtml1print/ignored-rules-007.xht"
       }
     ],
+    "css21_dev/xhtml1print/import-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/import-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/import-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/import-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/import-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/import-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/inherit-static-offset-001.xht": [
       {
         "path": "css21_dev/xhtml1print/inherit-static-offset-001.xht",
@@ -647562,6 +660093,30 @@
         "url": "/css21_dev/xhtml1print/invalid-decl-at-rule-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/keywords-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/keywords-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/keywords-000.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/keywords-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/keywords-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/keywords-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/keywords-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/lang-selector-002.xht": [
       {
         "path": "css21_dev/xhtml1print/lang-selector-002.xht",
@@ -649242,6 +661797,18 @@
         "url": "/css21_dev/xhtml1print/line-height-bleed-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/list-style-020.xht": [
+      {
+        "path": "css21_dev/xhtml1print/list-style-020.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/list-style-020-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/list-style-020.xht"
+      }
+    ],
     "css21_dev/xhtml1print/list-style-image-004.xht": [
       {
         "path": "css21_dev/xhtml1print/list-style-image-004.xht",
@@ -653742,6 +666309,42 @@
         "url": "/css21_dev/xhtml1print/margin-top-applies-to-015.xht"
       }
     ],
+    "css21_dev/xhtml1print/matching-brackets-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/matching-brackets-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/matching-brackets-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/matching-brackets-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/matching-brackets-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/matching-brackets-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/matching-brackets-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/matching-brackets-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/matching-brackets-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/matching-brackets-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/matching-brackets-003.xht"
+      }
+    ],
     "css21_dev/xhtml1print/max-height-001.xht": [
       {
         "path": "css21_dev/xhtml1print/max-height-001.xht",
@@ -658350,6 +670953,18 @@
         "url": "/css21_dev/xhtml1print/numbers-units-003.xht"
       }
     ],
+    "css21_dev/xhtml1print/numbers-units-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-004.xht"
+      }
+    ],
     "css21_dev/xhtml1print/numbers-units-005.xht": [
       {
         "path": "css21_dev/xhtml1print/numbers-units-005.xht",
@@ -658362,6 +670977,106 @@
         "url": "/css21_dev/xhtml1print/numbers-units-005.xht"
       }
     ],
+    "css21_dev/xhtml1print/numbers-units-006.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-006.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-filled-black-96px-square.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-006.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-007.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-007.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-007-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-007.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-009.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-009.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-009-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-009.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-010.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-010.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-010-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-010.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-011.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-011.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-011-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-011.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-012.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-012.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-013.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-013.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-013-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-013.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-015.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-014-ref-a.xht",
+            "=="
+          ],
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-014-ref-b.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-015.xht"
+      }
+    ],
     "css21_dev/xhtml1print/numbers-units-016.xht": [
       {
         "path": "css21_dev/xhtml1print/numbers-units-016.xht",
@@ -658386,6 +671101,42 @@
         "url": "/css21_dev/xhtml1print/numbers-units-017.xht"
       }
     ],
+    "css21_dev/xhtml1print/numbers-units-018.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-018-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-018.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-019.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-019.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-019-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-019.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/numbers-units-021.xht": [
+      {
+        "path": "css21_dev/xhtml1print/numbers-units-021.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/numbers-units-021-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/numbers-units-021.xht"
+      }
+    ],
     "css21_dev/xhtml1print/other-attribute-001.xht": [
       {
         "path": "css21_dev/xhtml1print/other-attribute-001.xht",
@@ -663978,6 +676729,54 @@
         "url": "/css21_dev/xhtml1print/quoted-keywords-002.xht"
       }
     ],
+    "css21_dev/xhtml1print/quoted-string-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/quoted-string-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-002.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/quoted-string-003.xht": [
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-003.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-003.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/quoted-string-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/quoted-string-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/quoted-string-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/quoted-string-004.xht"
+      }
+    ],
     "css21_dev/xhtml1print/quotes-035.xht": [
       {
         "path": "css21_dev/xhtml1print/quotes-035.xht",
@@ -667154,6 +679953,18 @@
         "url": "/css21_dev/xhtml1print/run-in-text-between-005.xht"
       }
     ],
+    "css21_dev/xhtml1print/selectors-parsing-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/selectors-parsing-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/selectors-parsing-001-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/selectors-parsing-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/separated-border-model-003a.xht": [
       {
         "path": "css21_dev/xhtml1print/separated-border-model-003a.xht",
@@ -667274,6 +680085,18 @@
         "url": "/css21_dev/xhtml1print/separated-border-model-009.xht"
       }
     ],
+    "css21_dev/xhtml1print/sgml-comments-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/sgml-comments-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/sgml-comments-000.xht"
+      }
+    ],
     "css21_dev/xhtml1print/sgml-comments-001.xht": [
       {
         "path": "css21_dev/xhtml1print/sgml-comments-001.xht",
@@ -667286,6 +680109,18 @@
         "url": "/css21_dev/xhtml1print/sgml-comments-001.xht"
       }
     ],
+    "css21_dev/xhtml1print/sgml-comments-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/sgml-comments-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/sgml-comments-002-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/sgml-comments-002.xht"
+      }
+    ],
     "css21_dev/xhtml1print/shand-border-000.xht": [
       {
         "path": "css21_dev/xhtml1print/shand-border-000.xht",
@@ -667550,6 +680385,18 @@
         "url": "/css21_dev/xhtml1print/stack-floats-004.xht"
       }
     ],
+    "css21_dev/xhtml1print/strings-000.xht": [
+      {
+        "path": "css21_dev/xhtml1print/strings-000.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/strings-000.xht"
+      }
+    ],
     "css21_dev/xhtml1print/style-attr-cascade-001.xht": [
       {
         "path": "css21_dev/xhtml1print/style-attr-cascade-001.xht",
@@ -669466,6 +682313,18 @@
         "url": "/css21_dev/xhtml1print/units-004.xht"
       }
     ],
+    "css21_dev/xhtml1print/units-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/units-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/units-005-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/units-005.xht"
+      }
+    ],
     "css21_dev/xhtml1print/units-006.xht": [
       {
         "path": "css21_dev/xhtml1print/units-006.xht",
@@ -669526,6 +682385,18 @@
         "url": "/css21_dev/xhtml1print/universal-selector-004.xht"
       }
     ],
+    "css21_dev/xhtml1print/unterminated-string-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/unterminated-string-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/filler-text-below-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/unterminated-string-001.xht"
+      }
+    ],
     "css21_dev/xhtml1print/uri-001.xht": [
       {
         "path": "css21_dev/xhtml1print/uri-001.xht",
@@ -669562,6 +682433,30 @@
         "url": "/css21_dev/xhtml1print/uri-003.xht"
       }
     ],
+    "css21_dev/xhtml1print/uri-004.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-004.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-004.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/uri-005.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-005.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-005.xht"
+      }
+    ],
     "css21_dev/xhtml1print/uri-006.xht": [
       {
         "path": "css21_dev/xhtml1print/uri-006.xht",
@@ -669634,6 +682529,18 @@
         "url": "/css21_dev/xhtml1print/uri-011.xht"
       }
     ],
+    "css21_dev/xhtml1print/uri-012.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-012.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/uri-012-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-012.xht"
+      }
+    ],
     "css21_dev/xhtml1print/uri-013.xht": [
       {
         "path": "css21_dev/xhtml1print/uri-013.xht",
@@ -669646,6 +682553,66 @@
         "url": "/css21_dev/xhtml1print/uri-013.xht"
       }
     ],
+    "css21_dev/xhtml1print/uri-014.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-014.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-014.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/uri-015.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-015.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-green-background.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-015.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/uri-016.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-016.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/uri-016-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-016.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/uri-017.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-017.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/uri-017-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-017.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/uri-018.xht": [
+      {
+        "path": "css21_dev/xhtml1print/uri-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/uri-018.xht"
+      }
+    ],
     "css21_dev/xhtml1print/vertical-align-004.xht": [
       {
         "path": "css21_dev/xhtml1print/vertical-align-004.xht",
@@ -670858,6 +683825,30 @@
         "url": "/css21_dev/xhtml1print/white-space-processing-049.xht"
       }
     ],
+    "css21_dev/xhtml1print/whitespace-001.xht": [
+      {
+        "path": "css21_dev/xhtml1print/whitespace-001.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/whitespace-001.xht"
+      }
+    ],
+    "css21_dev/xhtml1print/whitespace-002.xht": [
+      {
+        "path": "css21_dev/xhtml1print/whitespace-002.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/no-red-filler-text-ref.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/whitespace-002.xht"
+      }
+    ],
     "css21_dev/xhtml1print/width-001.xht": [
       {
         "path": "css21_dev/xhtml1print/width-001.xht",
@@ -672971,7 +685962,7 @@
       }
     ]
   },
-  "rev": "c8ec30de8099360ecf6581035bfdf2180fcc9755",
+  "rev": "584b6cdd10401df603bd7bdf4ec801fcddc65468",
   "url_base": "/",
   "version": 2
 }
\ No newline at end of file
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-001.htm.ini
new file mode 100644
index 00000000000..0a433e1c565
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-001.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-002.htm.ini
new file mode 100644
index 00000000000..7d74e28e34a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-002.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-003.htm.ini
new file mode 100644
index 00000000000..7af0c528464
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-003.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-004.htm.ini
new file mode 100644
index 00000000000..1d0c148fa9c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-004.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-005.htm.ini
new file mode 100644
index 00000000000..a072f3e8bf8
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-005.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-006.htm.ini
new file mode 100644
index 00000000000..d43dde3bf9d
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-006.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-006.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-007.htm.ini
new file mode 100644
index 00000000000..0b114bb4226
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-007.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-007.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-008.htm.ini
new file mode 100644
index 00000000000..6761cde0201
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-008.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-008.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-009.htm.ini
new file mode 100644
index 00000000000..8fc7f684eac
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-009.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-009.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-010.htm.ini
new file mode 100644
index 00000000000..553d480b4c0
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-010.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-010.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-011.htm.ini
new file mode 100644
index 00000000000..cf79d16d933
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-011.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-011.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-012.htm.ini
new file mode 100644
index 00000000000..095028505c8
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-012.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-012.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-014.htm.ini
new file mode 100644
index 00000000000..869c7c53ab4
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-014.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-014.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-015.htm.ini
new file mode 100644
index 00000000000..5049e881c1a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-015.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-015.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-016.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-016.htm.ini
new file mode 100644
index 00000000000..3b63a1c1f46
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-016.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-016.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-019.htm.ini
new file mode 100644
index 00000000000..b1eed1ecff9
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-019.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-019.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-020.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-020.htm.ini
new file mode 100644
index 00000000000..0503e133961
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-020.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-020.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-021.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-021.htm.ini
new file mode 100644
index 00000000000..e8a1c3f0258
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-021.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-021.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-024.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-024.htm.ini
new file mode 100644
index 00000000000..852ecb54c82
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-024.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-024.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-025.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-025.htm.ini
new file mode 100644
index 00000000000..dbeb381460f
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-025.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-025.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-026.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-026.htm.ini
new file mode 100644
index 00000000000..863ce667cfa
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-026.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-026.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-027.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-027.htm.ini
new file mode 100644
index 00000000000..43a7809a606
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-027.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-027.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-028.htm.ini
new file mode 100644
index 00000000000..ebf27be93de
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-028.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-028.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-029.htm.ini
new file mode 100644
index 00000000000..99eee9d118e
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-029.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-029.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-030.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-030.htm.ini
new file mode 100644
index 00000000000..7bb89c7554c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-030.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-030.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-040.htm.ini
new file mode 100644
index 00000000000..f7815fd6097
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-040.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-040.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-041.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-041.htm.ini
new file mode 100644
index 00000000000..4d4c2c20a7b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-041.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-041.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-042.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-042.htm.ini
new file mode 100644
index 00000000000..b791ae70d87
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-042.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-042.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-043.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-043.htm.ini
new file mode 100644
index 00000000000..f7aaa086ec8
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-043.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-043.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-044.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-044.htm.ini
new file mode 100644
index 00000000000..2e344f7582b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-044.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-044.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-045.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-045.htm.ini
new file mode 100644
index 00000000000..58ec1784998
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-045.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-045.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-046.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-046.htm.ini
new file mode 100644
index 00000000000..7f6c169cc3c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-046.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-046.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-047.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-047.htm.ini
new file mode 100644
index 00000000000..1f2c8c5fbee
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-047.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-047.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-048.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-048.htm.ini
new file mode 100644
index 00000000000..060244c08b5
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-048.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-048.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-charset-060.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-charset-060.htm.ini
new file mode 100644
index 00000000000..76eb1b5c2f4
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-charset-060.htm.ini
@@ -0,0 +1,3 @@
+[at-charset-060.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-import-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-import-009.htm.ini
new file mode 100644
index 00000000000..c412bb7de26
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-import-009.htm.ini
@@ -0,0 +1,3 @@
+[at-import-009.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-import-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-import-010.htm.ini
new file mode 100644
index 00000000000..bbbaa7917d3
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-import-010.htm.ini
@@ -0,0 +1,3 @@
+[at-import-010.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/at-keywords-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/at-keywords-000.htm.ini
new file mode 100644
index 00000000000..dcc06995155
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/at-keywords-000.htm.ini
@@ -0,0 +1,3 @@
+[at-keywords-000.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/attribute-token-selector-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/attribute-token-selector-002.htm.ini
new file mode 100644
index 00000000000..7e070cdc440
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/attribute-token-selector-002.htm.ini
@@ -0,0 +1,3 @@
+[attribute-token-selector-002.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-004.htm.ini
new file mode 100644
index 00000000000..edfc25f8133
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-004.htm.ini
@@ -0,0 +1,3 @@
+[bidi-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c547-indent-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c547-indent-000.htm.ini
new file mode 100644
index 00000000000..5fc93668206
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/c547-indent-000.htm.ini
@@ -0,0 +1,3 @@
+[c547-indent-000.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5510-padn-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5510-padn-000.htm.ini
new file mode 100644
index 00000000000..5573df4b40c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/c5510-padn-000.htm.ini
@@ -0,0 +1,3 @@
+[c5510-padn-000.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/cascade-import-dynamic-control.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/cascade-import-dynamic-control.htm.ini
new file mode 100644
index 00000000000..f0a3cbaf277
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/cascade-import-dynamic-control.htm.ini
@@ -0,0 +1,3 @@
+[cascade-import-dynamic-control.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-003.htm.ini
new file mode 100644
index 00000000000..4824f370cbe
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-003.htm.ini
@@ -0,0 +1,3 @@
+[case-sensitive-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-004.htm.ini
new file mode 100644
index 00000000000..76c672ce8d7
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-004.htm.ini
@@ -0,0 +1,3 @@
+[case-sensitive-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-005.htm.ini
new file mode 100644
index 00000000000..c0edb7400fe
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/case-sensitive-005.htm.ini
@@ -0,0 +1,3 @@
+[case-sensitive-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-000.htm.ini
new file mode 100644
index 00000000000..99b301a3b2a
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/color-000.htm.ini
@@ -0,0 +1,3 @@
+[color-000.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-000.htm.ini
new file mode 100644
index 00000000000..a9f9b3daa78
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-000.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-000.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-004.htm.ini
new file mode 100644
index 00000000000..591fb194e21
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-004.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-005.htm.ini
new file mode 100644
index 00000000000..0a2da447c25
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-005.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-006.htm.ini
new file mode 100644
index 00000000000..902850273d5
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-006.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-006.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-007.htm.ini
new file mode 100644
index 00000000000..eca9147a9c2
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-007.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-007.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-008.htm.ini
new file mode 100644
index 00000000000..fee67bcc49c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-008.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-008.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-009.htm.ini
new file mode 100644
index 00000000000..af4b5960724
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-009.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-009.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-010.htm.ini
new file mode 100644
index 00000000000..2fa33f7343f
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-010.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-010.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-011.htm.ini
new file mode 100644
index 00000000000..691a909e432
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-011.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-011.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-012.htm.ini
new file mode 100644
index 00000000000..5990e44a4f7
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-012.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-012.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-013.htm.ini
new file mode 100644
index 00000000000..ed3ce02cac7
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-013.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-013.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-014.htm.ini
new file mode 100644
index 00000000000..b4e53c239cd
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-014.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-014.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-015.htm.ini
new file mode 100644
index 00000000000..714253a7cb5
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-015.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-015.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-counter-016.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-counter-016.htm.ini
new file mode 100644
index 00000000000..75520714ca8
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/content-counter-016.htm.ini
@@ -0,0 +1,3 @@
+[content-counter-016.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/core-syntax-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/core-syntax-009.htm.ini
new file mode 100644
index 00000000000..7c398b6a6dd
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/core-syntax-009.htm.ini
@@ -0,0 +1,3 @@
+[core-syntax-009.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-001.htm.ini
new file mode 100644
index 00000000000..3dae056be5b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-001.htm.ini
@@ -0,0 +1,3 @@
+[counters-001.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-003.htm.ini
new file mode 100644
index 00000000000..af021db7406
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-003.htm.ini
@@ -0,0 +1,3 @@
+[counters-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-004.htm.ini
new file mode 100644
index 00000000000..0c625b12c29
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-004.htm.ini
@@ -0,0 +1,3 @@
+[counters-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-005.htm.ini
new file mode 100644
index 00000000000..7244a4a3ed3
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-005.htm.ini
@@ -0,0 +1,3 @@
+[counters-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-006.htm.ini
new file mode 100644
index 00000000000..52b4b93c338
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-006.htm.ini
@@ -0,0 +1,3 @@
+[counters-006.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-007.htm.ini
new file mode 100644
index 00000000000..5f9193785b1
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-007.htm.ini
@@ -0,0 +1,3 @@
+[counters-007.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-008.htm.ini
new file mode 100644
index 00000000000..47b9ddec662
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-008.htm.ini
@@ -0,0 +1,3 @@
+[counters-008.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-009.htm.ini
new file mode 100644
index 00000000000..064a456a062
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-009.htm.ini
@@ -0,0 +1,3 @@
+[counters-009.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counters-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counters-010.htm.ini
new file mode 100644
index 00000000000..1d6acb6f10c
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/counters-010.htm.ini
@@ -0,0 +1,3 @@
+[counters-010.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/declarations-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/declarations-009.htm.ini
new file mode 100644
index 00000000000..d2d823d8192
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/declarations-009.htm.ini
@@ -0,0 +1,3 @@
+[declarations-009.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-family-invalid-characters-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-family-invalid-characters-003.htm.ini
new file mode 100644
index 00000000000..adde708cff4
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/font-family-invalid-characters-003.htm.ini
@@ -0,0 +1,3 @@
+[font-family-invalid-characters-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/ident-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/ident-003.htm.ini
new file mode 100644
index 00000000000..c3e2ffda557
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/ident-003.htm.ini
@@ -0,0 +1,3 @@
+[ident-003.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/ident-020.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/ident-020.htm.ini
new file mode 100644
index 00000000000..93d14a85615
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/ident-020.htm.ini
@@ -0,0 +1,3 @@
+[ident-020.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-007.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-007.htm.ini
new file mode 100644
index 00000000000..5d9f2a6d5bd
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-007.htm.ini
@@ -0,0 +1,5 @@
+[numbers-units-007.htm]
+  type: reftest
+  expected:
+    if os == "mac": PASS
+    FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-009.htm.ini
new file mode 100644
index 00000000000..b5f00656f0d
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-009.htm.ini
@@ -0,0 +1,5 @@
+[numbers-units-009.htm]
+  type: reftest
+  expected:
+    if os == "mac": PASS
+    FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-010.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-010.htm.ini
new file mode 100644
index 00000000000..b892f07e3f2
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-010.htm.ini
@@ -0,0 +1,5 @@
+[numbers-units-010.htm]
+  type: reftest
+  expected:
+    if os == "mac": PASS
+    FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-011.htm.ini
new file mode 100644
index 00000000000..157da3ee760
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-011.htm.ini
@@ -0,0 +1,5 @@
+[numbers-units-011.htm]
+  type: reftest
+  expected:
+    if os == "mac": PASS
+    FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-012.htm.ini
new file mode 100644
index 00000000000..59eda50e263
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-012.htm.ini
@@ -0,0 +1,3 @@
+[numbers-units-012.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-015.htm.ini
new file mode 100644
index 00000000000..cd71832adf9
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-015.htm.ini
@@ -0,0 +1,3 @@
+[numbers-units-015.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-018.htm.ini
new file mode 100644
index 00000000000..232a3f71a50
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-018.htm.ini
@@ -0,0 +1,3 @@
+[numbers-units-018.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-019.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-019.htm.ini
new file mode 100644
index 00000000000..3e91a89d3a3
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-019.htm.ini
@@ -0,0 +1,3 @@
+[numbers-units-019.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/numbers-units-021.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-021.htm.ini
new file mode 100644
index 00000000000..ac52a83e888
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/numbers-units-021.htm.ini
@@ -0,0 +1,5 @@
+[numbers-units-021.htm]
+  type: reftest
+  expected:
+    if os == "mac": PASS
+    FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/style-attr-cascade-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/style-attr-cascade-004.htm.ini
new file mode 100644
index 00000000000..7ea1140bdc7
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/style-attr-cascade-004.htm.ini
@@ -0,0 +1,3 @@
+[style-attr-cascade-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/style-attr-cascade-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/style-attr-cascade-005.htm.ini
new file mode 100644
index 00000000000..db7b262e9ff
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/style-attr-cascade-005.htm.ini
@@ -0,0 +1,3 @@
+[style-attr-cascade-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/uri-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/uri-004.htm.ini
new file mode 100644
index 00000000000..25b236d6dd0
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/uri-004.htm.ini
@@ -0,0 +1,3 @@
+[uri-004.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/uri-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/uri-005.htm.ini
new file mode 100644
index 00000000000..91b33bb70db
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/uri-005.htm.ini
@@ -0,0 +1,3 @@
+[uri-005.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/uri-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/uri-014.htm.ini
new file mode 100644
index 00000000000..2711988f37b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/uri-014.htm.ini
@@ -0,0 +1,3 @@
+[uri-014.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/uri-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/uri-018.htm.ini
new file mode 100644
index 00000000000..e29d2770a33
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/uri-018.htm.ini
@@ -0,0 +1,3 @@
+[uri-018.htm]
+  type: reftest
+  expected: FAIL