diff --git a/tests/wpt/css-tests/css-color-3_dev/html4/chapter-3.htm b/tests/wpt/css-tests/css-color-3_dev/html4/chapter-3.htm
index 15318341006..593aa5c25b8 100644
--- a/tests/wpt/css-tests/css-color-3_dev/html4/chapter-3.htm
+++ b/tests/wpt/css-tests/css-color-3_dev/html4/chapter-3.htm
@@ -52,7 +52,7 @@
       <tr id="t31-color-text-a-3.1" class="">
         <td>
             <a href="t31-color-text-a.htm">t31-color-text-a</a></td>
-        <td></td>
+        <td><a href="reference/t31-color-text-a-ref.htm">&#x2260;</a> </td>
         <td></td>
         <td>color
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-color-3_dev/html4/reference/t31-color-text-a-ref.htm b/tests/wpt/css-tests/css-color-3_dev/html4/reference/t31-color-text-a-ref.htm
new file mode 100644
index 00000000000..49294395ab3
--- /dev/null
+++ b/tests/wpt/css-tests/css-color-3_dev/html4/reference/t31-color-text-a-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 Notref Black "should be green"</title>
+		<link rel="author" title="Geoffrey Sneddon" href="mailto:me@gsnedders.com">
+		<style type="text/css">
+			#one { color: #000; color: rgb(0,0,0); color: black; }
+		</style>
+	</head>
+	<body>
+		<p id="one">This text should be green.</p>
+	</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-color-3_dev/html4/reftest-toc.htm b/tests/wpt/css-tests/css-color-3_dev/html4/reftest-toc.htm
index 59cd865389a..2d36fdf42e9 100644
--- a/tests/wpt/css-tests/css-color-3_dev/html4/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-color-3_dev/html4/reftest-toc.htm
@@ -32,6 +32,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="t31-color-text-a" class="">
+      <tr>
+        <td rowspan="1" title="color">
+          <a href="t31-color-text-a.htm">t31-color-text-a</a></td>
+        <td><a href="reference/t31-color-text-a-ref.htm">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="t32-opacity-offscreen-multiple-boxes-1-c" class="">
       <tr>
         <td rowspan="1" title="opacity">
diff --git a/tests/wpt/css-tests/css-color-3_dev/html4/reftest.list b/tests/wpt/css-tests/css-color-3_dev/html4/reftest.list
index 1084ebdc204..1650a2f5eaf 100644
--- a/tests/wpt/css-tests/css-color-3_dev/html4/reftest.list
+++ b/tests/wpt/css-tests/css-color-3_dev/html4/reftest.list
@@ -1,5 +1,6 @@
 
 t31-color-currentColor-b.htm == reference/t31-color-currentColor-b-ref.htm
+t31-color-text-a.htm != reference/t31-color-text-a-ref.htm
 t32-opacity-offscreen-multiple-boxes-1-c.htm == reference/t32-opacity-offscreen-multiple-boxes-1-c-ref.htm
 t32-opacity-offscreen-multiple-boxes-2-c.htm == reference/t32-opacity-offscreen-multiple-boxes-2-c-ref.htm
 t421-rgb-func-int-a.htm == reference/t422-rgba-func-int-a-ref.htm
diff --git a/tests/wpt/css-tests/css-color-3_dev/html4/t31-color-text-a.htm b/tests/wpt/css-tests/css-color-3_dev/html4/t31-color-text-a.htm
index 2a7d4b7aee9..ff3b049c8c0 100644
--- a/tests/wpt/css-tests/css-color-3_dev/html4/t31-color-text-a.htm
+++ b/tests/wpt/css-tests/css-color-3_dev/html4/t31-color-text-a.htm
@@ -5,6 +5,7 @@
 		<link rel="author" title="L. David Baron" href="http://dbaron.org/">
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#foreground">
+		<link rel="mismatch" href="reference/t31-color-text-a-ref.htm">
 		<meta name="flags" content="">
 		<meta name="assert" content="That color sets the color of the text.">
 		<style type="text/css">
diff --git a/tests/wpt/css-tests/css-color-3_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-color-3_dev/implementation-report-TEMPLATE.data
index 1e85c151637..43f5be74b88 100644
--- a/tests/wpt/css-tests/css-color-3_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-color-3_dev/implementation-report-TEMPLATE.data
@@ -5,8 +5,8 @@
 testname	revision	result	comment
 html4/t31-color-currentcolor-b.htm	51435ad4b7dd3607d521a4a541f0a3f6cb8a3ec2	?
 xhtml1/t31-color-currentcolor-b.xht	51435ad4b7dd3607d521a4a541f0a3f6cb8a3ec2	?
-html4/t31-color-text-a.htm	9538f997c484b1a56e62bf452ad69959dad4a25d	?
-xhtml1/t31-color-text-a.xht	9538f997c484b1a56e62bf452ad69959dad4a25d	?
+html4/t31-color-text-a.htm	e7be34e63f92ded17bbd9922e91c1d1ad7da2b00	?
+xhtml1/t31-color-text-a.xht	e7be34e63f92ded17bbd9922e91c1d1ad7da2b00	?
 html4/t32-opacity-basic-0.0-a.htm	826a3101a145e1b107604480ee65173b2a5ff82b	?
 xhtml1/t32-opacity-basic-0.0-a.xht	826a3101a145e1b107604480ee65173b2a5ff82b	?
 html4/t32-opacity-basic-0.6-a.htm	5b5a57257ed37e168206ede5c905d01516944971	?
diff --git a/tests/wpt/css-tests/css-color-3_dev/testinfo.data b/tests/wpt/css-tests/css-color-3_dev/testinfo.data
index 482712ecd24..9868a690bd1 100644
--- a/tests/wpt/css-tests/css-color-3_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-color-3_dev/testinfo.data
@@ -1,6 +1,6 @@
 id	references	title	flags	links	revision	credits	assertion
 t31-color-currentColor-b	reference/t31-color-currentColor-b-ref	color		http://www.w3.org/TR/css3-color/#foreground,http://www.w3.org/TR/css3-color/#currentcolor	51435ad4b7dd3607d521a4a541f0a3f6cb8a3ec2	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	That currentColor on the color property acts like inherit.
-t31-color-text-a		color		http://www.w3.org/TR/css3-color/#foreground	9538f997c484b1a56e62bf452ad69959dad4a25d	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	That color sets the color of the text.
+t31-color-text-a	!reference/t31-color-text-a-ref	color		http://www.w3.org/TR/css3-color/#foreground	e7be34e63f92ded17bbd9922e91c1d1ad7da2b00	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	That color sets the color of the text.
 t32-opacity-basic-0.0-a		opacity		http://www.w3.org/TR/css3-color/#transparency	826a3101a145e1b107604480ee65173b2a5ff82b	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	Opacity of 0.0 makes box transparent.
 t32-opacity-basic-0.6-a		opacity		http://www.w3.org/TR/css3-color/#transparency,http://www.w3.org/TR/css3-color/#rgb-color	5b5a57257ed37e168206ede5c905d01516944971	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	Opacity of 0.6 makes box partially opaque. Colors are in sRGB color space (may test).
 t32-opacity-basic-1.0-a		opacity		http://www.w3.org/TR/css3-color/#transparency	84e1b35cd17744db43573559f57f22afc6481fd8	`L. David Baron`<http://dbaron.org/>,`Mozilla Corporation`<http://mozilla.com/>	Opacity of 1.0 makes box fully opaque.
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1/chapter-3.xht
index 15b0ec53f31..2ebbf52cf30 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1/chapter-3.xht
@@ -52,7 +52,7 @@
       <tr id="t31-color-text-a-3.1" class="">
         <td>
             <a href="t31-color-text-a.xht">t31-color-text-a</a></td>
-        <td></td>
+        <td><a href="reference/t31-color-text-a-ref.xht">&#x2260;</a> </td>
         <td></td>
         <td>color
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1/reference/t31-color-text-a-ref.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1/reference/t31-color-text-a-ref.xht
new file mode 100644
index 00000000000..59ac3a59160
--- /dev/null
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1/reference/t31-color-text-a-ref.xht
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Notref Black "should be green"</title>
+		<link rel="author" title="Geoffrey Sneddon" href="mailto:me@gsnedders.com"/>
+		<style type="text/css"><![CDATA[
+			#one { color: #000; color: rgb(0,0,0); color: black; }
+		]]></style>
+	</head>
+	<body>
+		<p id="one">This text should be green.</p>
+	</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest-toc.xht
index 48c30eab0a0..90364406aab 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest-toc.xht
@@ -32,6 +32,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="t31-color-text-a" class="">
+      <tr>
+        <td rowspan="1" title="color">
+          <a href="t31-color-text-a.xht">t31-color-text-a</a></td>
+        <td><a href="reference/t31-color-text-a-ref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="t32-opacity-offscreen-multiple-boxes-1-c" class="">
       <tr>
         <td rowspan="1" title="opacity">
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest.list
index 3c785d4a72f..9999100dc4a 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1/reftest.list
@@ -1,5 +1,6 @@
 
 t31-color-currentColor-b.xht == reference/t31-color-currentColor-b-ref.xht
+t31-color-text-a.xht != reference/t31-color-text-a-ref.xht
 t32-opacity-offscreen-multiple-boxes-1-c.xht == reference/t32-opacity-offscreen-multiple-boxes-1-c-ref.xht
 t32-opacity-offscreen-multiple-boxes-2-c.xht == reference/t32-opacity-offscreen-multiple-boxes-2-c-ref.xht
 t421-rgb-func-int-a.xht == reference/t422-rgba-func-int-a-ref.xht
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1/t31-color-text-a.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1/t31-color-text-a.xht
index 8d12eb45cbb..ffa1aa79bc0 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1/t31-color-text-a.xht
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1/t31-color-text-a.xht
@@ -5,6 +5,7 @@
 		<link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/"/>
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#foreground"/>
+		<link rel="mismatch" href="reference/t31-color-text-a-ref.xht"/>
 		<meta name="flags" content=""/>
 		<meta name="assert" content="That color sets the color of the text."/>
 		<style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/chapter-3.xht
index 15b0ec53f31..2ebbf52cf30 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/chapter-3.xht
@@ -52,7 +52,7 @@
       <tr id="t31-color-text-a-3.1" class="">
         <td>
             <a href="t31-color-text-a.xht">t31-color-text-a</a></td>
-        <td></td>
+        <td><a href="reference/t31-color-text-a-ref.xht">&#x2260;</a> </td>
         <td></td>
         <td>color
           <ul class="assert">
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reference/t31-color-text-a-ref.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reference/t31-color-text-a-ref.xht
new file mode 100644
index 00000000000..5e45e479852
--- /dev/null
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reference/t31-color-text-a-ref.xht
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>CSS Notref Black "should be green"</title>
+  <style type="text/css">
+    @page { font: italic 8pt sans-serif; color: gray;
+            margin: 7%;
+            counter-increment: page;
+            @top-left { content: "CSS Color Module Level 3 Conformance Test Suite"; }
+            @top-right { content: "Test t31-color-text-a-ref"; }
+            @bottom-right { content: counter(page); }
+          }
+</style>
+		<link rel="author" title="Geoffrey Sneddon" href="mailto:me@gsnedders.com"/>
+		<style type="text/css"><![CDATA[
+			#one { color: #000; color: rgb(0,0,0); color: black; }
+		]]></style>
+	</head>
+	<body>
+		<p id="one">This text should be green.</p>
+	</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest-toc.xht
index 48c30eab0a0..90364406aab 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest-toc.xht
@@ -32,6 +32,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="t31-color-text-a" class="">
+      <tr>
+        <td rowspan="1" title="color">
+          <a href="t31-color-text-a.xht">t31-color-text-a</a></td>
+        <td><a href="reference/t31-color-text-a-ref.xht">&#x2260;</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="t32-opacity-offscreen-multiple-boxes-1-c" class="">
       <tr>
         <td rowspan="1" title="opacity">
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest.list
index 3c785d4a72f..9999100dc4a 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/reftest.list
@@ -1,5 +1,6 @@
 
 t31-color-currentColor-b.xht == reference/t31-color-currentColor-b-ref.xht
+t31-color-text-a.xht != reference/t31-color-text-a-ref.xht
 t32-opacity-offscreen-multiple-boxes-1-c.xht == reference/t32-opacity-offscreen-multiple-boxes-1-c-ref.xht
 t32-opacity-offscreen-multiple-boxes-2-c.xht == reference/t32-opacity-offscreen-multiple-boxes-2-c-ref.xht
 t421-rgb-func-int-a.xht == reference/t422-rgba-func-int-a-ref.xht
diff --git a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/t31-color-text-a.xht b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/t31-color-text-a.xht
index cc3ff52dae6..c2368d57ad3 100644
--- a/tests/wpt/css-tests/css-color-3_dev/xhtml1print/t31-color-text-a.xht
+++ b/tests/wpt/css-tests/css-color-3_dev/xhtml1print/t31-color-text-a.xht
@@ -14,6 +14,7 @@
 		<link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/"/>
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#foreground"/>
+		<link rel="mismatch" href="reference/t31-color-text-a-ref.xht"/>
 		<meta name="flags" content=""/>
 		<meta name="assert" content="That color sets the color of the text."/>
 		<style type="text/css"><![CDATA[
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-10.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-10.htm
index cdc7cd02b05..596a4279c0b 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-10.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-10.htm
@@ -173,336 +173,6 @@
     <tbody id="s10.1.#example-bb213bd3">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s.#abstract">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#acknowledgments">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-align-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-break-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-cascade-4">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-display-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-images-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-overflow-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-position-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-pseudo-4">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-sizing-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-text-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-ui-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-values-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-writing-modes-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css21">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-align">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-break">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-display">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-sizing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-writing-modes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3col">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3ui">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-html40">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-rfc2119">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-atomic-painting">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-basis-zero">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-continuity">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-line-bug">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-line-floor">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-intrinsic-ratio">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-intrinsic-sizes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-main-depend-cross">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-min-width">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-percent-margins">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-static-pos">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-stretch-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-stretch-definite">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-unresolvable-basis">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-abspos-ordering">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clamp-single-line">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clarify-stretched">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-css21-staticpos">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-definite-flexing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-flex-animation">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-flex-basis-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-max-intrinsic">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-intrinsic-percentages">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-main-size-basis">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-not">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-ratio">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-resolve-flex">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-algo-breaks">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-align-content-wrapping">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-clamped-specified">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-content">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-display-longhands">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-flexed-definite-container">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-inner-base-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-layout-vs-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-min-auto-specified-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-neither">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-table-wrappers">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-unclamped-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2012">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2014-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2014-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-201403">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-201409">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-abspos-items">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-clamping">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-display-blockification">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-first-line-letter">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-flex-container-sizing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-float-display">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-line-breaking">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-overflow-flex-containers">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-painting-order">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-stretch-computed-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-table-anon-boxes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-white-space">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conformance">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conformance-classes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#contents">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conventions">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-0401c357">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-cd819179">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-f839f6c8">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#experimental">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index-defined-elsewhere">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index-defined-here">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#informative">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#normative">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#overview-example">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#partial">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#property-index">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#quiet-pubrules-1">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#quiet-pubrules-2">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#references">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#status">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#subtitle">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#testing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#title">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#w3c_process_revision">
-      <!-- 0 tests -->
-    </tbody>
   </table>
 
  </body>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-11.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-11.htm
new file mode 100644
index 00000000000..5d8e74ea347
--- /dev/null
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-11.htm
@@ -0,0 +1,420 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+  <title>Privacy and Security Considerations - CSS Flexible Box Layout Module Level 1 CR Test Suite</title>
+  <style type="text/css">
+    @import "http://www.w3.org/StyleSheets/TR/base.css";
+    @import "../indices.css";
+  </style>
+ </head>
+
+ <body>
+
+  <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
+  <h2>Privacy and Security Considerations (0 tests)</h2>
+  <table width="100%">
+    <col id="test-column">
+    <col id="refs-column">
+    <col id="flags-column">
+    <col id="info-column">
+    <thead>
+      <tr>
+        <th>Test</th>
+        <th><abbr title="Rendering References">Refs</abbr></th>
+        <th>Flags</th>
+        <th>Info</th>
+      </tr>
+    </thead>
+    <tbody id="s11">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s11">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#priv-sec">11 Privacy and Security Considerations</a></th></tr>
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#abstract">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#acknowledgments">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-align-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-break-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-cascade-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-display-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-images-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-pseudo-4">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-sizing-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-text-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-ui-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-values-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-writing-modes-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css21">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-align">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-break">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-display">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-sizing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-writing-modes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3col">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3ui">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-html5">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-rfc2119">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-atomic-painting">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-basis-zero">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-continuity">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-line-bug">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-line-floor">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-intrinsic-ratio">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-intrinsic-sizes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-main-depend-cross">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-min-width">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-percent-margins">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-static-pos">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-stretch-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-stretch-definite">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-unresolvable-basis">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2014-blockify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-abspos-ordering">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clamp-single-line">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clarify-stretched">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-css21-staticpos">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-definite-flexing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-flex-animation">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-flex-basis-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-max-intrinsic">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-intrinsic-percentages">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-main-size-basis">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-not">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-ratio">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-resolve-flex">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-algo-breaks">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-align-content-wrapping">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-clamped-specified">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-content">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-display-longhands">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-flexed-definite-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-inner-base-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-layout-vs-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-min-auto-specified-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-neither">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-table-wrappers">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-unclamped-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-a11y-tools">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-align-self-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-anonymous-fixup">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-flex-basis-zero">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-cross-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-items">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-main-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-min-auto-intrinsic-percentages">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-min-max-constraint">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-percentage-margins">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201505-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201505-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2012">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2014-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2014-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201403">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201409">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2015-first-fragment">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201505">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-abspos-items">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-clamping">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-display-blockification">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-first-line-letter">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-flex-container-sizing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-float-display">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-line-breaking">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-overflow-flex-containers">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-painting-order">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-stretch-computed-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-table-anon-boxes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-white-space">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-classes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-future-proofing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-partial">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-responsible">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-testing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conformance">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#contents">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#cr-exit-criteria">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#document-conventions">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-a13d9f9a">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-cd819179">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-e79a6187">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-ede42902">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index-defined-elsewhere">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index-defined-here">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#informative">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#normative">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#overview-example">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#property-index">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#quiet-pubrules-1">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#quiet-pubrules-2">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#references">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#status">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#subtitle">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#title">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#toc">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#w3c_process_revision">
+      <!-- 0 tests -->
+    </tbody>
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-2.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-2.htm
index a1c53513a40..6b01f183288 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-2.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-2.htm
@@ -42,16 +42,16 @@
     <tbody id="s2.#cross-dimension">
       <!-- 0 tests -->
     </tbody>
+    <tbody id="s2.#cross-end">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s2.#cross-size">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#cross-size-property">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s2.#cross_end">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s2.#cross_start">
+    <tbody id="s2.#cross-start">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#flex-container">
@@ -364,16 +364,16 @@
     <tbody id="s2.#main-dimension">
       <!-- 0 tests -->
     </tbody>
+    <tbody id="s2.#main-end">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s2.#main-size">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#main-size-property">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s2.#main_end">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s2.#main_start">
+    <tbody id="s2.#main-start">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm
index fea36a4fef9..d88228519f1 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-4.htm
@@ -231,13 +231,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s4.#example-f7107939">
+    <tbody id="s4.#example-c848375c">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.#flex_level">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s4.#table-items">
+    <tbody id="s4.#flex-level">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.1">
@@ -281,7 +278,7 @@
     <tbody id="s4.1.#example-5860ae02">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.1.#static_position-rectangle">
+    <tbody id="s4.1.#static-position-rectangle">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.2">
@@ -432,7 +429,7 @@
     <tbody id="s4.4.#collapsed-flex-item">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.4.#example-f6817be4">
+    <tbody id="s4.4.#example-292b3351">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.4.#nav-about">
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-5.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-5.htm
index 0aa7d9f15ca..41074524954 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-5.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-5.htm
@@ -1130,7 +1130,7 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s5.3.#example-ce59c06d">
+    <tbody id="s5.3.#example-e030b2cc">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s5.3.#propdef-flex-flow">
@@ -1804,10 +1804,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s5.4.#example-6155594a">
+    <tbody id="s5.4.#example-acefdb57">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s5.4.#order_modified-document-order">
+    <tbody id="s5.4.#order-modified-document-order">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s5.4.#propdef-order">
@@ -1982,7 +1982,10 @@
         <a href="https://www.w3.org/TR/css-flexbox-1/#order-accessibility">5.4.1 Reordering and Accessibility</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s5.4.1.#example-465c9ea3">
+    <tbody id="s5.4.1.#example-93473bb9">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s5.4.1.#example-e1d8dda6">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-6.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-6.htm
index 48a1cd4fbb8..9e4ec108f96 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-6.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-6.htm
@@ -46,19 +46,19 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s6.#example-c8b950d1">
+    <tbody id="s6.#example-218e9240">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#example-e4bd6579">
+    <tbody id="s6.#example-3406d1fd">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s6.#flex-line">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#multi_line">
+    <tbody id="s6.#multi-line">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#single_line">
+    <tbody id="s6.#single-line">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-7.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-7.htm
index 0081b2ed9cf..fab695e3983 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-7.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-7.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
-  <h2>Flexibility (156 tests)</h2>
+  <h2>Flexibility (155 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -849,24 +849,13 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s7.1.#flex-basis">
-      <!-- 1 tests -->
-      <tr id="autoheight-regions-in-autoheight-flexbox-003-7.1.#flex-basis" class="ahem">
-        <td>
-            <a href="autoheight-regions-in-autoheight-flexbox-003.htm">autoheight-regions-in-autoheight-flexbox-003</a></td>
-        <td><a href="reference/autoheight-regions-in-autoheight-flexbox-003-ref.htm">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>CSS Regions: auto-height regions in auto-height flexbox with flex basis
-          <ul class="assert">
-            <li>Test checks that the computed height of auto-height regions placed in a flex container takes into the account the flex basis property. The space available inside the flex container should be distributed according to the flex basis property. In this particular case, each of the three regions must have a height equal to one third of the flex container's height.</li>
-          </ul>
-        </td>
-      </tr>
-    </tbody>
-    <tbody id="s7.1.#flex-grow-factor">
+    <tbody id="s7.1.#flex-flex-basis">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s7.1.#flex-shrink-factor">
+    <tbody id="s7.1.#flex-flex-grow-factor">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s7.1.#flex-flex-shrink-factor">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s7.1.#flexible-length">
@@ -931,6 +920,12 @@
         </td>
       </tr>
     </tbody>
+    <tbody id="s7.1.#valdef-flex-basis-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s7.1.#valdef-flex-basis-content">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s7.1.#valdef-flex-flex-basis">
       <!-- 0 tests -->
     </tbody>
@@ -946,7 +941,7 @@
     <tbody id="s7.1.1">
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.1.1">+</a>
-        <a href="https://www.w3.org/TR/css-flexbox-1/#flex-common">7.1.1 Common Values of flex</a></th></tr>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#flex-common">7.1.1 Basic Values of flex</a></th></tr>
       <!-- 5 tests -->
       <tr id="flexbox_flex-auto-7.1.1" class="">
         <td>
@@ -1356,12 +1351,6 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s7.2.3.#auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s7.2.3.#content">
-      <!-- 0 tests -->
-    </tbody>
     <tbody id="s7.2.3.#propdef-flex-basis">
       <!-- 9 tests -->
       <tr id="flex-basis-001-7.2.3.#propdef-flex-basis" class="">
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-8.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-8.htm
index 0ef10550dd0..e362f31f037 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-8.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-8.htm
@@ -104,7 +104,7 @@
     <tbody id="s8.1.#example-30f9440a">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s8.1.#example-c2f4f7f3">
+    <tbody id="s8.1.#example-f1650544">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s8.1.#login">
@@ -1793,10 +1793,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s8.5.#cross_axis-baseline">
+    <tbody id="s8.5.#cross-axis-baseline">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s8.5.#main_axis-baseline">
+    <tbody id="s8.5.#main-axis-baseline">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm
index 1d8fbc8f00a..cefdf343979 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-9.htm
@@ -510,7 +510,7 @@
     <tbody id="s9.2.#algo-main-item">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.2.#example-5ea64ac4">
+    <tbody id="s9.2.#example-2cd7caf1">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s9.2.#flex-base-size">
@@ -728,16 +728,22 @@
         <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-sizes">9.9 Intrinsic Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#max_content-cross-size">
+    <tbody id="s9.9.1">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.1">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-main-sizes">9.9.1 Flex Container Intrinsic Main Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#max_content-main-size">
+    <tbody id="s9.9.2">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.2">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-cross-sizes">9.9.2 Flex Container Intrinsic Cross Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#min_content-cross-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s9.9.#min_content-main-size">
+    <tbody id="s9.9.3">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.3">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-item-contributions">9.9.3 Flex Item Intrinsic Size Contributions</a></th></tr>
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-A.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-A.htm
new file mode 100644
index 00000000000..ffd6a223a92
--- /dev/null
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/chapter-A.htm
@@ -0,0 +1,48 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+  <title>Axis Mappings - CSS Flexible Box Layout Module Level 1 CR Test Suite</title>
+  <style type="text/css">
+    @import "http://www.w3.org/StyleSheets/TR/base.css";
+    @import "../indices.css";
+  </style>
+ </head>
+
+ <body>
+
+  <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
+  <h2>Axis Mappings (0 tests)</h2>
+  <table width="100%">
+    <col id="test-column">
+    <col id="refs-column">
+    <col id="flags-column">
+    <col id="info-column">
+    <thead>
+      <tr>
+        <th>Test</th>
+        <th><abbr title="Rendering References">Refs</abbr></th>
+        <th>Flags</th>
+        <th>Info</th>
+      </tr>
+    </thead>
+    <tbody id="sA">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#sA">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#axis-mapping">A Axis Mappings</a></th></tr>
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-en">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-fa">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-ja">
+      <!-- 0 tests -->
+    </tbody>
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm
index 1237912c7b0..2920427d381 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/toc.htm
@@ -52,7 +52,7 @@
     <tbody id="s7">
       <tr><th><a href="chapter-7.htm">Chapter 7 - 
         Flexibility</a></th>
-      <td>(156 Tests)</td></tr>
+      <td>(155 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.htm">Chapter 8 - 
@@ -69,6 +69,16 @@
         Fragmenting Flex Layout</a></th>
       <td>(16 Tests)</td></tr>
     </tbody>
+    <tbody id="s11">
+      <tr><th><a href="chapter-11.htm">Chapter 11 - 
+        Privacy and Security Considerations</a></th>
+      <td>(0 Tests)</td></tr>
+    </tbody>
+    <tbody id="sA">
+      <tr><th><a href="chapter-A.htm">Appendix A - 
+        Axis Mappings</a></th>
+      <td>(0 Tests)</td></tr>
+    </tbody>
   </table>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-10.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-10.xht
index 341190dd8fc..567763debc4 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-10.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-10.xht
@@ -173,336 +173,6 @@
     <tbody id="s10.1.#example-bb213bd3">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s.#abstract">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#acknowledgments">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-align-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-break-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-cascade-4">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-display-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-images-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-overflow-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-position-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-pseudo-4">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-sizing-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-text-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-ui-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-values-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-writing-modes-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css21">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-align">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-break">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-display">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-sizing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-writing-modes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3col">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3ui">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-html40">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-rfc2119">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-atomic-painting">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-basis-zero">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-continuity">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-line-bug">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-line-floor">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-intrinsic-ratio">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-intrinsic-sizes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-main-depend-cross">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-min-width">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-percent-margins">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-static-pos">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-stretch-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-stretch-definite">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-unresolvable-basis">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-abspos-ordering">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clamp-single-line">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clarify-stretched">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-css21-staticpos">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-definite-flexing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-flex-animation">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-flex-basis-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-max-intrinsic">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-intrinsic-percentages">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-main-size-basis">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-not">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-ratio">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-resolve-flex">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-algo-breaks">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-align-content-wrapping">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-clamped-specified">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-content">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-display-longhands">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-flexed-definite-container">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-inner-base-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-layout-vs-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-min-auto-specified-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-neither">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-table-wrappers">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-unclamped-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2012">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2014-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2014-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-201403">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-201409">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-abspos-items">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-clamping">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-display-blockification">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-first-line-letter">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-flex-container-sizing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-float-display">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-line-breaking">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-overflow-flex-containers">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-painting-order">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-stretch-computed-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-table-anon-boxes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-white-space">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conformance">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conformance-classes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#contents">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conventions">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-0401c357">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-cd819179">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-f839f6c8">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#experimental">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index-defined-elsewhere">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index-defined-here">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#informative">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#normative">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#overview-example">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#partial">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#property-index">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#quiet-pubrules-1">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#quiet-pubrules-2">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#references">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#status">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#subtitle">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#testing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#title">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#w3c_process_revision">
-      <!-- 0 tests -->
-    </tbody>
   </table>
 
  </body>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-11.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-11.xht
new file mode 100644
index 00000000000..a702146daea
--- /dev/null
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-11.xht
@@ -0,0 +1,420 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Privacy and Security Considerations - CSS Flexible Box Layout Module Level 1 CR Test Suite</title>
+  <style type="text/css">
+    @import "http://www.w3.org/StyleSheets/TR/base.css";
+    @import "../indices.css";
+  </style>
+ </head>
+
+ <body>
+
+  <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
+  <h2>Privacy and Security Considerations (0 tests)</h2>
+  <table width="100%">
+    <col id="test-column"></col>
+    <col id="refs-column"></col>
+    <col id="flags-column"></col>
+    <col id="info-column"></col>
+    <thead>
+      <tr>
+        <th>Test</th>
+        <th><abbr title="Rendering References">Refs</abbr></th>
+        <th>Flags</th>
+        <th>Info</th>
+      </tr>
+    </thead>
+    <tbody id="s11">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s11">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#priv-sec">11 Privacy and Security Considerations</a></th></tr>
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#abstract">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#acknowledgments">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-align-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-break-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-cascade-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-display-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-images-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-pseudo-4">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-sizing-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-text-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-ui-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-values-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-writing-modes-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css21">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-align">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-break">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-display">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-sizing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-writing-modes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3col">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3ui">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-html5">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-rfc2119">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-atomic-painting">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-basis-zero">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-continuity">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-line-bug">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-line-floor">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-intrinsic-ratio">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-intrinsic-sizes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-main-depend-cross">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-min-width">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-percent-margins">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-static-pos">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-stretch-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-stretch-definite">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-unresolvable-basis">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2014-blockify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-abspos-ordering">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clamp-single-line">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clarify-stretched">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-css21-staticpos">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-definite-flexing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-flex-animation">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-flex-basis-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-max-intrinsic">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-intrinsic-percentages">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-main-size-basis">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-not">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-ratio">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-resolve-flex">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-algo-breaks">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-align-content-wrapping">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-clamped-specified">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-content">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-display-longhands">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-flexed-definite-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-inner-base-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-layout-vs-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-min-auto-specified-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-neither">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-table-wrappers">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-unclamped-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-a11y-tools">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-align-self-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-anonymous-fixup">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-flex-basis-zero">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-cross-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-items">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-main-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-min-auto-intrinsic-percentages">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-min-max-constraint">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-percentage-margins">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201505-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201505-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2012">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2014-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2014-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201403">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201409">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2015-first-fragment">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201505">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-abspos-items">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-clamping">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-display-blockification">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-first-line-letter">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-flex-container-sizing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-float-display">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-line-breaking">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-overflow-flex-containers">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-painting-order">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-stretch-computed-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-table-anon-boxes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-white-space">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-classes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-future-proofing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-partial">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-responsible">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-testing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conformance">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#contents">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#cr-exit-criteria">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#document-conventions">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-a13d9f9a">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-cd819179">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-e79a6187">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-ede42902">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index-defined-elsewhere">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index-defined-here">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#informative">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#normative">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#overview-example">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#property-index">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#quiet-pubrules-1">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#quiet-pubrules-2">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#references">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#status">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#subtitle">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#title">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#toc">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#w3c_process_revision">
+      <!-- 0 tests -->
+    </tbody>
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-2.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-2.xht
index e561b9290f2..8475923e92e 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-2.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-2.xht
@@ -42,16 +42,16 @@
     <tbody id="s2.#cross-dimension">
       <!-- 0 tests -->
     </tbody>
+    <tbody id="s2.#cross-end">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s2.#cross-size">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#cross-size-property">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s2.#cross_end">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s2.#cross_start">
+    <tbody id="s2.#cross-start">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#flex-container">
@@ -364,16 +364,16 @@
     <tbody id="s2.#main-dimension">
       <!-- 0 tests -->
     </tbody>
+    <tbody id="s2.#main-end">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s2.#main-size">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#main-size-property">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s2.#main_end">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s2.#main_start">
+    <tbody id="s2.#main-start">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht
index 1bd7951a4df..a54c7840794 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-4.xht
@@ -231,13 +231,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s4.#example-f7107939">
+    <tbody id="s4.#example-c848375c">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.#flex_level">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s4.#table-items">
+    <tbody id="s4.#flex-level">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.1">
@@ -281,7 +278,7 @@
     <tbody id="s4.1.#example-5860ae02">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.1.#static_position-rectangle">
+    <tbody id="s4.1.#static-position-rectangle">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.2">
@@ -432,7 +429,7 @@
     <tbody id="s4.4.#collapsed-flex-item">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.4.#example-f6817be4">
+    <tbody id="s4.4.#example-292b3351">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.4.#nav-about">
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-5.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-5.xht
index d5998fab18f..8295d407891 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-5.xht
@@ -1130,7 +1130,7 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s5.3.#example-ce59c06d">
+    <tbody id="s5.3.#example-e030b2cc">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s5.3.#propdef-flex-flow">
@@ -1804,10 +1804,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s5.4.#example-6155594a">
+    <tbody id="s5.4.#example-acefdb57">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s5.4.#order_modified-document-order">
+    <tbody id="s5.4.#order-modified-document-order">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s5.4.#propdef-order">
@@ -1982,7 +1982,10 @@
         <a href="https://www.w3.org/TR/css-flexbox-1/#order-accessibility">5.4.1 Reordering and Accessibility</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s5.4.1.#example-465c9ea3">
+    <tbody id="s5.4.1.#example-93473bb9">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s5.4.1.#example-e1d8dda6">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-6.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-6.xht
index 79f60ce438e..ef9c12a141e 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-6.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-6.xht
@@ -46,19 +46,19 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s6.#example-c8b950d1">
+    <tbody id="s6.#example-218e9240">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#example-e4bd6579">
+    <tbody id="s6.#example-3406d1fd">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s6.#flex-line">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#multi_line">
+    <tbody id="s6.#multi-line">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#single_line">
+    <tbody id="s6.#single-line">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-7.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-7.xht
index 9d5e290c5ef..2b714103995 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-7.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-7.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
-  <h2>Flexibility (156 tests)</h2>
+  <h2>Flexibility (155 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -849,24 +849,13 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s7.1.#flex-basis">
-      <!-- 1 tests -->
-      <tr id="autoheight-regions-in-autoheight-flexbox-003-7.1.#flex-basis" class="ahem">
-        <td>
-            <a href="autoheight-regions-in-autoheight-flexbox-003.xht">autoheight-regions-in-autoheight-flexbox-003</a></td>
-        <td><a href="reference/autoheight-regions-in-autoheight-flexbox-003-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>CSS Regions: auto-height regions in auto-height flexbox with flex basis
-          <ul class="assert">
-            <li>Test checks that the computed height of auto-height regions placed in a flex container takes into the account the flex basis property. The space available inside the flex container should be distributed according to the flex basis property. In this particular case, each of the three regions must have a height equal to one third of the flex container's height.</li>
-          </ul>
-        </td>
-      </tr>
-    </tbody>
-    <tbody id="s7.1.#flex-grow-factor">
+    <tbody id="s7.1.#flex-flex-basis">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s7.1.#flex-shrink-factor">
+    <tbody id="s7.1.#flex-flex-grow-factor">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s7.1.#flex-flex-shrink-factor">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s7.1.#flexible-length">
@@ -931,6 +920,12 @@
         </td>
       </tr>
     </tbody>
+    <tbody id="s7.1.#valdef-flex-basis-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s7.1.#valdef-flex-basis-content">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s7.1.#valdef-flex-flex-basis">
       <!-- 0 tests -->
     </tbody>
@@ -946,7 +941,7 @@
     <tbody id="s7.1.1">
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.1.1">+</a>
-        <a href="https://www.w3.org/TR/css-flexbox-1/#flex-common">7.1.1 Common Values of flex</a></th></tr>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#flex-common">7.1.1 Basic Values of flex</a></th></tr>
       <!-- 5 tests -->
       <tr id="flexbox_flex-auto-7.1.1" class="">
         <td>
@@ -1356,12 +1351,6 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s7.2.3.#auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s7.2.3.#content">
-      <!-- 0 tests -->
-    </tbody>
     <tbody id="s7.2.3.#propdef-flex-basis">
       <!-- 9 tests -->
       <tr id="flex-basis-001-7.2.3.#propdef-flex-basis" class="">
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-8.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-8.xht
index 87202549cc0..d6e97d9d326 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-8.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-8.xht
@@ -104,7 +104,7 @@
     <tbody id="s8.1.#example-30f9440a">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s8.1.#example-c2f4f7f3">
+    <tbody id="s8.1.#example-f1650544">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s8.1.#login">
@@ -1793,10 +1793,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s8.5.#cross_axis-baseline">
+    <tbody id="s8.5.#cross-axis-baseline">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s8.5.#main_axis-baseline">
+    <tbody id="s8.5.#main-axis-baseline">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht
index 32305e393ab..054abb13b4a 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-9.xht
@@ -510,7 +510,7 @@
     <tbody id="s9.2.#algo-main-item">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.2.#example-5ea64ac4">
+    <tbody id="s9.2.#example-2cd7caf1">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s9.2.#flex-base-size">
@@ -728,16 +728,22 @@
         <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-sizes">9.9 Intrinsic Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#max_content-cross-size">
+    <tbody id="s9.9.1">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.1">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-main-sizes">9.9.1 Flex Container Intrinsic Main Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#max_content-main-size">
+    <tbody id="s9.9.2">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.2">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-cross-sizes">9.9.2 Flex Container Intrinsic Cross Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#min_content-cross-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s9.9.#min_content-main-size">
+    <tbody id="s9.9.3">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.3">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-item-contributions">9.9.3 Flex Item Intrinsic Size Contributions</a></th></tr>
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-A.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-A.xht
new file mode 100644
index 00000000000..b8a302f79fb
--- /dev/null
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/chapter-A.xht
@@ -0,0 +1,48 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Axis Mappings - CSS Flexible Box Layout Module Level 1 CR Test Suite</title>
+  <style type="text/css">
+    @import "http://www.w3.org/StyleSheets/TR/base.css";
+    @import "../indices.css";
+  </style>
+ </head>
+
+ <body>
+
+  <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
+  <h2>Axis Mappings (0 tests)</h2>
+  <table width="100%">
+    <col id="test-column"></col>
+    <col id="refs-column"></col>
+    <col id="flags-column"></col>
+    <col id="info-column"></col>
+    <thead>
+      <tr>
+        <th>Test</th>
+        <th><abbr title="Rendering References">Refs</abbr></th>
+        <th>Flags</th>
+        <th>Info</th>
+      </tr>
+    </thead>
+    <tbody id="sA">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#sA">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#axis-mapping">A Axis Mappings</a></th></tr>
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-en">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-fa">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-ja">
+      <!-- 0 tests -->
+    </tbody>
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht
index d438407ed72..134ef8abb41 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/toc.xht
@@ -52,7 +52,7 @@
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
         Flexibility</a></th>
-      <td>(156 Tests)</td></tr>
+      <td>(155 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
@@ -69,6 +69,16 @@
         Fragmenting Flex Layout</a></th>
       <td>(16 Tests)</td></tr>
     </tbody>
+    <tbody id="s11">
+      <tr><th><a href="chapter-11.xht">Chapter 11 - 
+        Privacy and Security Considerations</a></th>
+      <td>(0 Tests)</td></tr>
+    </tbody>
+    <tbody id="sA">
+      <tr><th><a href="chapter-A.xht">Appendix A - 
+        Axis Mappings</a></th>
+      <td>(0 Tests)</td></tr>
+    </tbody>
   </table>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-10.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-10.xht
index 341190dd8fc..567763debc4 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-10.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-10.xht
@@ -173,336 +173,6 @@
     <tbody id="s10.1.#example-bb213bd3">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s.#abstract">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#acknowledgments">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-align-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-break-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-cascade-4">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-display-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-images-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-overflow-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-position-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-pseudo-4">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-sizing-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-text-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-ui-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-values-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css-writing-modes-3">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css21">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-align">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-break">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-display">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-sizing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3-writing-modes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3col">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-css3ui">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-html40">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#biblio-rfc2119">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-atomic-painting">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-basis-zero">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-continuity">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-line-bug">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-flex-line-floor">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-intrinsic-ratio">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-intrinsic-sizes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-main-depend-cross">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-min-width">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-percent-margins">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-static-pos">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-stretch-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-stretch-definite">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-2012-unresolvable-basis">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-abspos-ordering">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clamp-single-line">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-clarify-stretched">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-css21-staticpos">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-definite-flexing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-flex-animation">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-flex-basis-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-max-intrinsic">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-intrinsic-percentages">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-main-size-basis">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-not">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-min-auto-ratio">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-resolve-flex">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201403-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-algo-breaks">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-align-content-wrapping">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-clamped-specified">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-content">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-display-longhands">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-flexed-definite-container">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-inner-base-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-layout-vs-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-min-auto-specified-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-neither">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-table-wrappers">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#change-201409-unclamped-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2012">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2014-clarify">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-2014-substantive">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-201403">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#changes-201409">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-abspos-items">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-clamping">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-display-blockification">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-first-line-letter">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-flex-container-sizing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-float-display">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-line-breaking">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-overflow-flex-containers">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-painting-order">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-stretch-computed-auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-table-anon-boxes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#clarify-2012-white-space">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conformance">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conformance-classes">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#contents">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#conventions">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-0401c357">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-cd819179">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#example-f839f6c8">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#experimental">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index-defined-elsewhere">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#index-defined-here">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#informative">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#normative">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#overview-example">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#partial">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#property-index">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#quiet-pubrules-1">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#quiet-pubrules-2">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#references">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#status">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#subtitle">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#testing">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#title">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s.#w3c_process_revision">
-      <!-- 0 tests -->
-    </tbody>
   </table>
 
  </body>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-11.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-11.xht
new file mode 100644
index 00000000000..a702146daea
--- /dev/null
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-11.xht
@@ -0,0 +1,420 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Privacy and Security Considerations - CSS Flexible Box Layout Module Level 1 CR Test Suite</title>
+  <style type="text/css">
+    @import "http://www.w3.org/StyleSheets/TR/base.css";
+    @import "../indices.css";
+  </style>
+ </head>
+
+ <body>
+
+  <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
+  <h2>Privacy and Security Considerations (0 tests)</h2>
+  <table width="100%">
+    <col id="test-column"></col>
+    <col id="refs-column"></col>
+    <col id="flags-column"></col>
+    <col id="info-column"></col>
+    <thead>
+      <tr>
+        <th>Test</th>
+        <th><abbr title="Rendering References">Refs</abbr></th>
+        <th>Flags</th>
+        <th>Info</th>
+      </tr>
+    </thead>
+    <tbody id="s11">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s11">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#priv-sec">11 Privacy and Security Considerations</a></th></tr>
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#abstract">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#acknowledgments">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-align-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-break-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-cascade-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-display-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-images-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-pseudo-4">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-sizing-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-text-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-ui-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-values-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css-writing-modes-3">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css21">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-align">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-break">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-display">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-sizing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3-writing-modes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3col">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-css3ui">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-html5">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#biblio-rfc2119">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-atomic-painting">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-basis-zero">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-continuity">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-line-bug">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-flex-line-floor">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-intrinsic-ratio">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-intrinsic-sizes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-main-depend-cross">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-min-width">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-percent-margins">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-static-pos">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-stretch-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-stretch-definite">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2012-unresolvable-basis">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2014-blockify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-abspos-ordering">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clamp-single-line">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-clarify-stretched">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-css21-staticpos">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-definite-flexing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-flex-animation">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-flex-basis-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-max-intrinsic">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-intrinsic-percentages">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-main-size-basis">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-not">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-min-auto-ratio">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-resolve-flex">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201403-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-algo-breaks">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-align-content-wrapping">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-clamped-specified">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-content">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-display-longhands">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-flexed-definite-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-inner-base-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-layout-vs-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-min-auto-specified-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-neither">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-table-wrappers">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201409-unclamped-size">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-a11y-tools">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-align-self-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-anonymous-fixup">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-flex-basis-zero">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-cross-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-items">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-intrinsic-main-container">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-min-auto-intrinsic-percentages">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-min-max-constraint">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-2015-percentage-margins">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201505-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#change-201505-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2012">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2014-clarify">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2014-substantive">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201403">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201409">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-2015-first-fragment">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#changes-201505">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-abspos-items">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-clamping">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-display-blockification">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-first-line-letter">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-flex-container-sizing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-float-display">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-line-breaking">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-overflow-flex-containers">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-painting-order">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-stretch-computed-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-table-anon-boxes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#clarify-2012-white-space">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-classes">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-future-proofing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-partial">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-responsible">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conform-testing">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#conformance">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#contents">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#cr-exit-criteria">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#document-conventions">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-a13d9f9a">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-cd819179">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-e79a6187">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#example-ede42902">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index-defined-elsewhere">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#index-defined-here">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#informative">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#normative">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#overview-example">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#property-index">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#quiet-pubrules-1">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#quiet-pubrules-2">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#references">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#status">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#subtitle">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#title">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#toc">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s.#w3c_process_revision">
+      <!-- 0 tests -->
+    </tbody>
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-2.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-2.xht
index e561b9290f2..8475923e92e 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-2.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-2.xht
@@ -42,16 +42,16 @@
     <tbody id="s2.#cross-dimension">
       <!-- 0 tests -->
     </tbody>
+    <tbody id="s2.#cross-end">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s2.#cross-size">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#cross-size-property">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s2.#cross_end">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s2.#cross_start">
+    <tbody id="s2.#cross-start">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#flex-container">
@@ -364,16 +364,16 @@
     <tbody id="s2.#main-dimension">
       <!-- 0 tests -->
     </tbody>
+    <tbody id="s2.#main-end">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s2.#main-size">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s2.#main-size-property">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s2.#main_end">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s2.#main_start">
+    <tbody id="s2.#main-start">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht
index 1bd7951a4df..a54c7840794 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-4.xht
@@ -231,13 +231,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s4.#example-f7107939">
+    <tbody id="s4.#example-c848375c">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.#flex_level">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s4.#table-items">
+    <tbody id="s4.#flex-level">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.1">
@@ -281,7 +278,7 @@
     <tbody id="s4.1.#example-5860ae02">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.1.#static_position-rectangle">
+    <tbody id="s4.1.#static-position-rectangle">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.2">
@@ -432,7 +429,7 @@
     <tbody id="s4.4.#collapsed-flex-item">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s4.4.#example-f6817be4">
+    <tbody id="s4.4.#example-292b3351">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s4.4.#nav-about">
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-5.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-5.xht
index d5998fab18f..8295d407891 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-5.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-5.xht
@@ -1130,7 +1130,7 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s5.3.#example-ce59c06d">
+    <tbody id="s5.3.#example-e030b2cc">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s5.3.#propdef-flex-flow">
@@ -1804,10 +1804,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s5.4.#example-6155594a">
+    <tbody id="s5.4.#example-acefdb57">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s5.4.#order_modified-document-order">
+    <tbody id="s5.4.#order-modified-document-order">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s5.4.#propdef-order">
@@ -1982,7 +1982,10 @@
         <a href="https://www.w3.org/TR/css-flexbox-1/#order-accessibility">5.4.1 Reordering and Accessibility</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s5.4.1.#example-465c9ea3">
+    <tbody id="s5.4.1.#example-93473bb9">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s5.4.1.#example-e1d8dda6">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-6.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-6.xht
index 79f60ce438e..ef9c12a141e 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-6.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-6.xht
@@ -46,19 +46,19 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s6.#example-c8b950d1">
+    <tbody id="s6.#example-218e9240">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#example-e4bd6579">
+    <tbody id="s6.#example-3406d1fd">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s6.#flex-line">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#multi_line">
+    <tbody id="s6.#multi-line">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s6.#single_line">
+    <tbody id="s6.#single-line">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-7.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-7.xht
index 9d5e290c5ef..2b714103995 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-7.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-7.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
-  <h2>Flexibility (156 tests)</h2>
+  <h2>Flexibility (155 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -849,24 +849,13 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s7.1.#flex-basis">
-      <!-- 1 tests -->
-      <tr id="autoheight-regions-in-autoheight-flexbox-003-7.1.#flex-basis" class="ahem">
-        <td>
-            <a href="autoheight-regions-in-autoheight-flexbox-003.xht">autoheight-regions-in-autoheight-flexbox-003</a></td>
-        <td><a href="reference/autoheight-regions-in-autoheight-flexbox-003-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>CSS Regions: auto-height regions in auto-height flexbox with flex basis
-          <ul class="assert">
-            <li>Test checks that the computed height of auto-height regions placed in a flex container takes into the account the flex basis property. The space available inside the flex container should be distributed according to the flex basis property. In this particular case, each of the three regions must have a height equal to one third of the flex container's height.</li>
-          </ul>
-        </td>
-      </tr>
-    </tbody>
-    <tbody id="s7.1.#flex-grow-factor">
+    <tbody id="s7.1.#flex-flex-basis">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s7.1.#flex-shrink-factor">
+    <tbody id="s7.1.#flex-flex-grow-factor">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s7.1.#flex-flex-shrink-factor">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s7.1.#flexible-length">
@@ -931,6 +920,12 @@
         </td>
       </tr>
     </tbody>
+    <tbody id="s7.1.#valdef-flex-basis-auto">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="s7.1.#valdef-flex-basis-content">
+      <!-- 0 tests -->
+    </tbody>
     <tbody id="s7.1.#valdef-flex-flex-basis">
       <!-- 0 tests -->
     </tbody>
@@ -946,7 +941,7 @@
     <tbody id="s7.1.1">
       <tr><th colspan="4" scope="rowgroup">
         <a href="#s7.1.1">+</a>
-        <a href="https://www.w3.org/TR/css-flexbox-1/#flex-common">7.1.1 Common Values of flex</a></th></tr>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#flex-common">7.1.1 Basic Values of flex</a></th></tr>
       <!-- 5 tests -->
       <tr id="flexbox_flex-auto-7.1.1" class="">
         <td>
@@ -1356,12 +1351,6 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s7.2.3.#auto">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s7.2.3.#content">
-      <!-- 0 tests -->
-    </tbody>
     <tbody id="s7.2.3.#propdef-flex-basis">
       <!-- 9 tests -->
       <tr id="flex-basis-001-7.2.3.#propdef-flex-basis" class="">
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-8.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-8.xht
index 87202549cc0..d6e97d9d326 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-8.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-8.xht
@@ -104,7 +104,7 @@
     <tbody id="s8.1.#example-30f9440a">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s8.1.#example-c2f4f7f3">
+    <tbody id="s8.1.#example-f1650544">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s8.1.#login">
@@ -1793,10 +1793,10 @@
         </td>
       </tr>
     </tbody>
-    <tbody id="s8.5.#cross_axis-baseline">
+    <tbody id="s8.5.#cross-axis-baseline">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s8.5.#main_axis-baseline">
+    <tbody id="s8.5.#main-axis-baseline">
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht
index 32305e393ab..054abb13b4a 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-9.xht
@@ -510,7 +510,7 @@
     <tbody id="s9.2.#algo-main-item">
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.2.#example-5ea64ac4">
+    <tbody id="s9.2.#example-2cd7caf1">
       <!-- 0 tests -->
     </tbody>
     <tbody id="s9.2.#flex-base-size">
@@ -728,16 +728,22 @@
         <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-sizes">9.9 Intrinsic Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#max_content-cross-size">
+    <tbody id="s9.9.1">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.1">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-main-sizes">9.9.1 Flex Container Intrinsic Main Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#max_content-main-size">
+    <tbody id="s9.9.2">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.2">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-cross-sizes">9.9.2 Flex Container Intrinsic Cross Sizes</a></th></tr>
       <!-- 0 tests -->
     </tbody>
-    <tbody id="s9.9.#min_content-cross-size">
-      <!-- 0 tests -->
-    </tbody>
-    <tbody id="s9.9.#min_content-main-size">
+    <tbody id="s9.9.3">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#s9.9.3">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#intrinsic-item-contributions">9.9.3 Flex Item Intrinsic Size Contributions</a></th></tr>
       <!-- 0 tests -->
     </tbody>
   </table>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-A.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-A.xht
new file mode 100644
index 00000000000..b8a302f79fb
--- /dev/null
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/chapter-A.xht
@@ -0,0 +1,48 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Axis Mappings - CSS Flexible Box Layout Module Level 1 CR Test Suite</title>
+  <style type="text/css">
+    @import "http://www.w3.org/StyleSheets/TR/base.css";
+    @import "../indices.css";
+  </style>
+ </head>
+
+ <body>
+
+  <h1>CSS Flexible Box Layout Module Level 1 CR Test Suite</h1>
+  <h2>Axis Mappings (0 tests)</h2>
+  <table width="100%">
+    <col id="test-column"></col>
+    <col id="refs-column"></col>
+    <col id="flags-column"></col>
+    <col id="info-column"></col>
+    <thead>
+      <tr>
+        <th>Test</th>
+        <th><abbr title="Rendering References">Refs</abbr></th>
+        <th>Flags</th>
+        <th>Info</th>
+      </tr>
+    </thead>
+    <tbody id="sA">
+      <tr><th colspan="4" scope="rowgroup">
+        <a href="#sA">+</a>
+        <a href="https://www.w3.org/TR/css-flexbox-1/#axis-mapping">A Axis Mappings</a></th></tr>
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-en">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-fa">
+      <!-- 0 tests -->
+    </tbody>
+    <tbody id="sA.#axis-mapping-table-ja">
+      <!-- 0 tests -->
+    </tbody>
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht
index d438407ed72..134ef8abb41 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/toc.xht
@@ -52,7 +52,7 @@
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
         Flexibility</a></th>
-      <td>(156 Tests)</td></tr>
+      <td>(155 Tests)</td></tr>
     </tbody>
     <tbody id="s8">
       <tr><th><a href="chapter-8.xht">Chapter 8 - 
@@ -69,6 +69,16 @@
         Fragmenting Flex Layout</a></th>
       <td>(16 Tests)</td></tr>
     </tbody>
+    <tbody id="s11">
+      <tr><th><a href="chapter-11.xht">Chapter 11 - 
+        Privacy and Security Considerations</a></th>
+      <td>(0 Tests)</td></tr>
+    </tbody>
+    <tbody id="sA">
+      <tr><th><a href="chapter-A.xht">Appendix A - 
+        Axis Mappings</a></th>
+      <td>(0 Tests)</td></tr>
+    </tbody>
   </table>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-green.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-green.png
deleted file mode 100644
index b98ca0ba0a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-lime.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-lime.png
deleted file mode 100644
index cb397fb090e..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-maroon.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-maroon.png
deleted file mode 100644
index 3f86b072195..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-maroon.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-navy.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-navy.png
deleted file mode 100644
index 9b9a03955ba..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-navy.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-red.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-red.png
deleted file mode 100644
index 6bd73ac1018..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-white.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-white.png
deleted file mode 100644
index dd43faec54a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/1x1-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-gg-rr.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-gg-rr.png
deleted file mode 100644
index 84f5b2a4f1d..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-gg-rr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-green.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-green.png
deleted file mode 100644
index b3c8cf3eb4c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-red.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/60x60-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/README b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/README
deleted file mode 100644
index 2e5f2ad0738..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Global Support Directory
-============================
-
-This directory contains common support files (such as images and external
-style sheets). These are sync'ed into the support directories of all our
-test suites. If you have test-suite-specific support files, please add
-them to the appropriate test-suite-specific support/ directory.
-
-If you add to a support/ directory, please run the tools/supportprop.py
-script from the top of the repository to cascade support files into the
-lower-level support directories.
-
-Description of the Common Support File Collection
--------------------------------------------------
-
-The 1x1-* images are all exactly one pixel.
-
-The swatch-* images all use 15x15 cells.
-
-The square-* images all use 15x15 cells with one pixel borders.
-
-The pattern-* images use cells of various sizes:
-
-   pattern-grg-rgr-grg.png   20x20
-   pattern-rgr-grg-rgr.png   20x20
-   pattern-tr.png            15x15
-   pattern-grg-rrg-rgg.png   15x15
-
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/a-green.css b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/a-green.css
deleted file mode 100644
index b0dbb071d5b..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/a-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.a { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/b-green.css b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/b-green.css
deleted file mode 100644
index a0473f5ca26..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/b-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.b { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/c-red.css b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/c-red.css
deleted file mode 100644
index d4ba5c64e95..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/c-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.c { color: red; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/cat.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/cat.png
deleted file mode 100644
index 85dd7324815..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/cat.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/import-green.css b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/import-green.css
deleted file mode 100644
index 537104e6633..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/import-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/import-red.css b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/import-red.css
deleted file mode 100644
index 9945ef47114..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/import-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: red; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-grg-rgr-grg.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-grg-rgr-grg.png
deleted file mode 100644
index 9b88fbd8114..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-grg-rgr-grg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-grg-rrg-rgg.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-grg-rrg-rgg.png
deleted file mode 100644
index fcf4f3fd7d9..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-grg-rrg-rgg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-rgr-grg-rgr.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-rgr-grg-rgr.png
deleted file mode 100644
index d454e3a630c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-rgr-grg-rgr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-tr.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-tr.png
deleted file mode 100644
index 8b4b25364e0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/pattern-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-h-50%.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-h-50%.png
deleted file mode 100644
index cf2eea6b438..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-h-50%.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-h-50px.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-h-50px.png
deleted file mode 100644
index 9f46583665c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-h-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-v-100px.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-v-100px.png
deleted file mode 100644
index a837eca2225..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-v-100px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-v-50px.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-v-50px.png
deleted file mode 100644
index 84141028020..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/ruler-v-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-purple.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-purple.png
deleted file mode 100644
index 0f522d78728..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-purple.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-teal.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-teal.png
deleted file mode 100644
index e567f51b91b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-white.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-white.png
deleted file mode 100644
index 5853cbb238c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/square-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-blue.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-blue.png
deleted file mode 100644
index bf2759634d4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-blue.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-green.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-green.png
deleted file mode 100644
index 0aa79b0c86b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-lime.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-lime.png
deleted file mode 100644
index 55fd7fdaedf..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-orange.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-orange.png
deleted file mode 100644
index d3cd498b52b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-orange.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-red.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-red.png
deleted file mode 100644
index 1caf25c992a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-teal.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-teal.png
deleted file mode 100644
index 0293ce89dea..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-white.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-white.png
deleted file mode 100644
index 1a7d4323d77..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-yellow.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-yellow.png
deleted file mode 100644
index 1591aa0e2e2..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/swatch-yellow.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-bl.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-bl.png
deleted file mode 100644
index 904e24e996a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-bl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-br.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-br.png
deleted file mode 100644
index f413ff5c1a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-br.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-inner-half-size.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-inner-half-size.png
deleted file mode 100644
index e473bf80efc..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-inner-half-size.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-outer.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-outer.png
deleted file mode 100644
index 82eeace7fc0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-outer.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-tl.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-tl.png
deleted file mode 100644
index f6ac0ef7e8f..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-tl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-tr.png b/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-tr.png
deleted file mode 100644
index 59843ae54b6..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/reference/support/test-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-green.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-green.png
deleted file mode 100644
index b98ca0ba0a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-lime.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-lime.png
deleted file mode 100644
index cb397fb090e..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-maroon.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-maroon.png
deleted file mode 100644
index 3f86b072195..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-maroon.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-navy.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-navy.png
deleted file mode 100644
index 9b9a03955ba..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-navy.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-red.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-red.png
deleted file mode 100644
index 6bd73ac1018..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-white.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-white.png
deleted file mode 100644
index dd43faec54a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/1x1-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-gg-rr.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-gg-rr.png
deleted file mode 100644
index 84f5b2a4f1d..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-gg-rr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-green.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-green.png
deleted file mode 100644
index b3c8cf3eb4c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-red.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/60x60-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/README b/tests/wpt/css-tests/css-masking-1_dev/html/support/README
deleted file mode 100644
index 2e5f2ad0738..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/support/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Global Support Directory
-============================
-
-This directory contains common support files (such as images and external
-style sheets). These are sync'ed into the support directories of all our
-test suites. If you have test-suite-specific support files, please add
-them to the appropriate test-suite-specific support/ directory.
-
-If you add to a support/ directory, please run the tools/supportprop.py
-script from the top of the repository to cascade support files into the
-lower-level support directories.
-
-Description of the Common Support File Collection
--------------------------------------------------
-
-The 1x1-* images are all exactly one pixel.
-
-The swatch-* images all use 15x15 cells.
-
-The square-* images all use 15x15 cells with one pixel borders.
-
-The pattern-* images use cells of various sizes:
-
-   pattern-grg-rgr-grg.png   20x20
-   pattern-rgr-grg-rgr.png   20x20
-   pattern-tr.png            15x15
-   pattern-grg-rrg-rgg.png   15x15
-
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/a-green.css b/tests/wpt/css-tests/css-masking-1_dev/html/support/a-green.css
deleted file mode 100644
index b0dbb071d5b..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/support/a-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.a { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/b-green.css b/tests/wpt/css-tests/css-masking-1_dev/html/support/b-green.css
deleted file mode 100644
index a0473f5ca26..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/support/b-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.b { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/c-red.css b/tests/wpt/css-tests/css-masking-1_dev/html/support/c-red.css
deleted file mode 100644
index d4ba5c64e95..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/support/c-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.c { color: red; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/cat.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/cat.png
deleted file mode 100644
index 85dd7324815..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/cat.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/import-green.css b/tests/wpt/css-tests/css-masking-1_dev/html/support/import-green.css
deleted file mode 100644
index 537104e6633..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/support/import-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/import-red.css b/tests/wpt/css-tests/css-masking-1_dev/html/support/import-red.css
deleted file mode 100644
index 9945ef47114..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/html/support/import-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: red; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-grg-rgr-grg.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-grg-rgr-grg.png
deleted file mode 100644
index 9b88fbd8114..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-grg-rgr-grg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-grg-rrg-rgg.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-grg-rrg-rgg.png
deleted file mode 100644
index fcf4f3fd7d9..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-grg-rrg-rgg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-rgr-grg-rgr.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-rgr-grg-rgr.png
deleted file mode 100644
index d454e3a630c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-rgr-grg-rgr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-tr.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-tr.png
deleted file mode 100644
index 8b4b25364e0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/pattern-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-h-50%.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-h-50%.png
deleted file mode 100644
index cf2eea6b438..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-h-50%.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-h-50px.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-h-50px.png
deleted file mode 100644
index 9f46583665c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-h-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-v-100px.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-v-100px.png
deleted file mode 100644
index a837eca2225..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-v-100px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-v-50px.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-v-50px.png
deleted file mode 100644
index 84141028020..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/ruler-v-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/square-purple.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/square-purple.png
deleted file mode 100644
index 0f522d78728..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/square-purple.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/square-teal.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/square-teal.png
deleted file mode 100644
index e567f51b91b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/square-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/square-white.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/square-white.png
deleted file mode 100644
index 5853cbb238c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/square-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-blue.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-blue.png
deleted file mode 100644
index bf2759634d4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-blue.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-green.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-green.png
deleted file mode 100644
index 0aa79b0c86b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-lime.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-lime.png
deleted file mode 100644
index 55fd7fdaedf..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-orange.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-orange.png
deleted file mode 100644
index d3cd498b52b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-orange.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-red.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-red.png
deleted file mode 100644
index 1caf25c992a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-teal.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-teal.png
deleted file mode 100644
index 0293ce89dea..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-white.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-white.png
deleted file mode 100644
index 1a7d4323d77..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-yellow.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-yellow.png
deleted file mode 100644
index 1591aa0e2e2..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/swatch-yellow.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-bl.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/test-bl.png
deleted file mode 100644
index 904e24e996a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-bl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-br.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/test-br.png
deleted file mode 100644
index f413ff5c1a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-br.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-inner-half-size.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/test-inner-half-size.png
deleted file mode 100644
index e473bf80efc..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-inner-half-size.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-outer.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/test-outer.png
deleted file mode 100644
index 82eeace7fc0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-outer.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-tl.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/test-tl.png
deleted file mode 100644
index f6ac0ef7e8f..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-tl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-tr.png b/tests/wpt/css-tests/css-masking-1_dev/html/support/test-tr.png
deleted file mode 100644
index 59843ae54b6..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/html/support/test-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-green.png
deleted file mode 100644
index b98ca0ba0a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-lime.png
deleted file mode 100644
index cb397fb090e..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-maroon.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-maroon.png
deleted file mode 100644
index 3f86b072195..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-maroon.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-navy.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-navy.png
deleted file mode 100644
index 9b9a03955ba..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-navy.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-red.png
deleted file mode 100644
index 6bd73ac1018..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-white.png
deleted file mode 100644
index dd43faec54a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/1x1-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-gg-rr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-gg-rr.png
deleted file mode 100644
index 84f5b2a4f1d..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-gg-rr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-green.png
deleted file mode 100644
index b3c8cf3eb4c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/60x60-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/README b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/README
deleted file mode 100644
index 2e5f2ad0738..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Global Support Directory
-============================
-
-This directory contains common support files (such as images and external
-style sheets). These are sync'ed into the support directories of all our
-test suites. If you have test-suite-specific support files, please add
-them to the appropriate test-suite-specific support/ directory.
-
-If you add to a support/ directory, please run the tools/supportprop.py
-script from the top of the repository to cascade support files into the
-lower-level support directories.
-
-Description of the Common Support File Collection
--------------------------------------------------
-
-The 1x1-* images are all exactly one pixel.
-
-The swatch-* images all use 15x15 cells.
-
-The square-* images all use 15x15 cells with one pixel borders.
-
-The pattern-* images use cells of various sizes:
-
-   pattern-grg-rgr-grg.png   20x20
-   pattern-rgr-grg-rgr.png   20x20
-   pattern-tr.png            15x15
-   pattern-grg-rrg-rgg.png   15x15
-
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/a-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/a-green.css
deleted file mode 100644
index b0dbb071d5b..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/a-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.a { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/b-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/b-green.css
deleted file mode 100644
index a0473f5ca26..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/b-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.b { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/c-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/c-red.css
deleted file mode 100644
index d4ba5c64e95..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/c-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.c { color: red; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/cat.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/cat.png
deleted file mode 100644
index 85dd7324815..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/cat.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/import-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/import-green.css
deleted file mode 100644
index 537104e6633..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/import-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/import-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/import-red.css
deleted file mode 100644
index 9945ef47114..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/import-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: red; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-grg-rgr-grg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-grg-rgr-grg.png
deleted file mode 100644
index 9b88fbd8114..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-grg-rgr-grg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-grg-rrg-rgg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-grg-rrg-rgg.png
deleted file mode 100644
index fcf4f3fd7d9..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-grg-rrg-rgg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-rgr-grg-rgr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-rgr-grg-rgr.png
deleted file mode 100644
index d454e3a630c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-rgr-grg-rgr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-tr.png
deleted file mode 100644
index 8b4b25364e0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/pattern-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-h-50%.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-h-50%.png
deleted file mode 100644
index cf2eea6b438..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-h-50%.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-h-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-h-50px.png
deleted file mode 100644
index 9f46583665c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-h-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-v-100px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-v-100px.png
deleted file mode 100644
index a837eca2225..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-v-100px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-v-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-v-50px.png
deleted file mode 100644
index 84141028020..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/ruler-v-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-purple.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-purple.png
deleted file mode 100644
index 0f522d78728..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-purple.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-teal.png
deleted file mode 100644
index e567f51b91b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-white.png
deleted file mode 100644
index 5853cbb238c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/square-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-blue.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-blue.png
deleted file mode 100644
index bf2759634d4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-blue.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-green.png
deleted file mode 100644
index 0aa79b0c86b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-lime.png
deleted file mode 100644
index 55fd7fdaedf..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-orange.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-orange.png
deleted file mode 100644
index d3cd498b52b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-orange.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-red.png
deleted file mode 100644
index 1caf25c992a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-teal.png
deleted file mode 100644
index 0293ce89dea..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-white.png
deleted file mode 100644
index 1a7d4323d77..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-yellow.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-yellow.png
deleted file mode 100644
index 1591aa0e2e2..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/swatch-yellow.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-bl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-bl.png
deleted file mode 100644
index 904e24e996a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-bl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-br.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-br.png
deleted file mode 100644
index f413ff5c1a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-br.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-inner-half-size.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-inner-half-size.png
deleted file mode 100644
index e473bf80efc..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-inner-half-size.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-outer.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-outer.png
deleted file mode 100644
index 82eeace7fc0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-outer.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-tl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-tl.png
deleted file mode 100644
index f6ac0ef7e8f..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-tl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-tr.png
deleted file mode 100644
index 59843ae54b6..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/reference/support/test-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-green.png
deleted file mode 100644
index b98ca0ba0a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-lime.png
deleted file mode 100644
index cb397fb090e..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-maroon.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-maroon.png
deleted file mode 100644
index 3f86b072195..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-maroon.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-navy.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-navy.png
deleted file mode 100644
index 9b9a03955ba..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-navy.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-red.png
deleted file mode 100644
index 6bd73ac1018..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-white.png
deleted file mode 100644
index dd43faec54a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/1x1-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-gg-rr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-gg-rr.png
deleted file mode 100644
index 84f5b2a4f1d..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-gg-rr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-green.png
deleted file mode 100644
index b3c8cf3eb4c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/60x60-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/README b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/README
deleted file mode 100644
index 2e5f2ad0738..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Global Support Directory
-============================
-
-This directory contains common support files (such as images and external
-style sheets). These are sync'ed into the support directories of all our
-test suites. If you have test-suite-specific support files, please add
-them to the appropriate test-suite-specific support/ directory.
-
-If you add to a support/ directory, please run the tools/supportprop.py
-script from the top of the repository to cascade support files into the
-lower-level support directories.
-
-Description of the Common Support File Collection
--------------------------------------------------
-
-The 1x1-* images are all exactly one pixel.
-
-The swatch-* images all use 15x15 cells.
-
-The square-* images all use 15x15 cells with one pixel borders.
-
-The pattern-* images use cells of various sizes:
-
-   pattern-grg-rgr-grg.png   20x20
-   pattern-rgr-grg-rgr.png   20x20
-   pattern-tr.png            15x15
-   pattern-grg-rrg-rgg.png   15x15
-
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/a-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/a-green.css
deleted file mode 100644
index b0dbb071d5b..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/a-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.a { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/b-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/b-green.css
deleted file mode 100644
index a0473f5ca26..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/b-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.b { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/c-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/c-red.css
deleted file mode 100644
index d4ba5c64e95..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/c-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.c { color: red; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/cat.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/cat.png
deleted file mode 100644
index 85dd7324815..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/cat.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/import-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/import-green.css
deleted file mode 100644
index 537104e6633..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/import-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/import-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/import-red.css
deleted file mode 100644
index 9945ef47114..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/import-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: red; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-grg-rgr-grg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-grg-rgr-grg.png
deleted file mode 100644
index 9b88fbd8114..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-grg-rgr-grg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-grg-rrg-rgg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-grg-rrg-rgg.png
deleted file mode 100644
index fcf4f3fd7d9..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-grg-rrg-rgg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-rgr-grg-rgr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-rgr-grg-rgr.png
deleted file mode 100644
index d454e3a630c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-rgr-grg-rgr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-tr.png
deleted file mode 100644
index 8b4b25364e0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/pattern-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-h-50%.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-h-50%.png
deleted file mode 100644
index cf2eea6b438..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-h-50%.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-h-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-h-50px.png
deleted file mode 100644
index 9f46583665c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-h-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-v-100px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-v-100px.png
deleted file mode 100644
index a837eca2225..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-v-100px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-v-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-v-50px.png
deleted file mode 100644
index 84141028020..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/ruler-v-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-purple.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-purple.png
deleted file mode 100644
index 0f522d78728..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-purple.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-teal.png
deleted file mode 100644
index e567f51b91b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-white.png
deleted file mode 100644
index 5853cbb238c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/square-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-blue.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-blue.png
deleted file mode 100644
index bf2759634d4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-blue.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-green.png
deleted file mode 100644
index 0aa79b0c86b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-lime.png
deleted file mode 100644
index 55fd7fdaedf..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-orange.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-orange.png
deleted file mode 100644
index d3cd498b52b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-orange.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-red.png
deleted file mode 100644
index 1caf25c992a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-teal.png
deleted file mode 100644
index 0293ce89dea..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-white.png
deleted file mode 100644
index 1a7d4323d77..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-yellow.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-yellow.png
deleted file mode 100644
index 1591aa0e2e2..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/swatch-yellow.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-bl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-bl.png
deleted file mode 100644
index 904e24e996a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-bl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-br.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-br.png
deleted file mode 100644
index f413ff5c1a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-br.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-inner-half-size.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-inner-half-size.png
deleted file mode 100644
index e473bf80efc..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-inner-half-size.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-outer.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-outer.png
deleted file mode 100644
index 82eeace7fc0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-outer.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-tl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-tl.png
deleted file mode 100644
index f6ac0ef7e8f..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-tl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-tr.png
deleted file mode 100644
index 59843ae54b6..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1/support/test-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-green.png
deleted file mode 100644
index b98ca0ba0a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-lime.png
deleted file mode 100644
index cb397fb090e..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-maroon.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-maroon.png
deleted file mode 100644
index 3f86b072195..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-maroon.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-navy.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-navy.png
deleted file mode 100644
index 9b9a03955ba..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-navy.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-red.png
deleted file mode 100644
index 6bd73ac1018..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-white.png
deleted file mode 100644
index dd43faec54a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/1x1-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-gg-rr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-gg-rr.png
deleted file mode 100644
index 84f5b2a4f1d..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-gg-rr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-green.png
deleted file mode 100644
index b3c8cf3eb4c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/60x60-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/README b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/README
deleted file mode 100644
index 2e5f2ad0738..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Global Support Directory
-============================
-
-This directory contains common support files (such as images and external
-style sheets). These are sync'ed into the support directories of all our
-test suites. If you have test-suite-specific support files, please add
-them to the appropriate test-suite-specific support/ directory.
-
-If you add to a support/ directory, please run the tools/supportprop.py
-script from the top of the repository to cascade support files into the
-lower-level support directories.
-
-Description of the Common Support File Collection
--------------------------------------------------
-
-The 1x1-* images are all exactly one pixel.
-
-The swatch-* images all use 15x15 cells.
-
-The square-* images all use 15x15 cells with one pixel borders.
-
-The pattern-* images use cells of various sizes:
-
-   pattern-grg-rgr-grg.png   20x20
-   pattern-rgr-grg-rgr.png   20x20
-   pattern-tr.png            15x15
-   pattern-grg-rrg-rgg.png   15x15
-
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/a-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/a-green.css
deleted file mode 100644
index b0dbb071d5b..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/a-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.a { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/b-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/b-green.css
deleted file mode 100644
index a0473f5ca26..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/b-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.b { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/c-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/c-red.css
deleted file mode 100644
index d4ba5c64e95..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/c-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.c { color: red; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/cat.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/cat.png
deleted file mode 100644
index 85dd7324815..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/cat.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/import-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/import-green.css
deleted file mode 100644
index 537104e6633..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/import-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/import-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/import-red.css
deleted file mode 100644
index 9945ef47114..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/import-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: red; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-grg-rgr-grg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-grg-rgr-grg.png
deleted file mode 100644
index 9b88fbd8114..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-grg-rgr-grg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-grg-rrg-rgg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-grg-rrg-rgg.png
deleted file mode 100644
index fcf4f3fd7d9..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-grg-rrg-rgg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-rgr-grg-rgr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-rgr-grg-rgr.png
deleted file mode 100644
index d454e3a630c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-rgr-grg-rgr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-tr.png
deleted file mode 100644
index 8b4b25364e0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/pattern-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-h-50%.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-h-50%.png
deleted file mode 100644
index cf2eea6b438..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-h-50%.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-h-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-h-50px.png
deleted file mode 100644
index 9f46583665c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-h-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-v-100px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-v-100px.png
deleted file mode 100644
index a837eca2225..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-v-100px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-v-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-v-50px.png
deleted file mode 100644
index 84141028020..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/ruler-v-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-purple.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-purple.png
deleted file mode 100644
index 0f522d78728..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-purple.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-teal.png
deleted file mode 100644
index e567f51b91b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-white.png
deleted file mode 100644
index 5853cbb238c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/square-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-blue.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-blue.png
deleted file mode 100644
index bf2759634d4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-blue.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-green.png
deleted file mode 100644
index 0aa79b0c86b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-lime.png
deleted file mode 100644
index 55fd7fdaedf..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-orange.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-orange.png
deleted file mode 100644
index d3cd498b52b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-orange.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-red.png
deleted file mode 100644
index 1caf25c992a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-teal.png
deleted file mode 100644
index 0293ce89dea..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-white.png
deleted file mode 100644
index 1a7d4323d77..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-yellow.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-yellow.png
deleted file mode 100644
index 1591aa0e2e2..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/swatch-yellow.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-bl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-bl.png
deleted file mode 100644
index 904e24e996a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-bl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-br.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-br.png
deleted file mode 100644
index f413ff5c1a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-br.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-inner-half-size.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-inner-half-size.png
deleted file mode 100644
index e473bf80efc..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-inner-half-size.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-outer.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-outer.png
deleted file mode 100644
index 82eeace7fc0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-outer.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-tl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-tl.png
deleted file mode 100644
index f6ac0ef7e8f..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-tl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-tr.png
deleted file mode 100644
index 59843ae54b6..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/reference/support/test-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-green.png
deleted file mode 100644
index b98ca0ba0a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-lime.png
deleted file mode 100644
index cb397fb090e..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-maroon.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-maroon.png
deleted file mode 100644
index 3f86b072195..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-maroon.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-navy.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-navy.png
deleted file mode 100644
index 9b9a03955ba..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-navy.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-red.png
deleted file mode 100644
index 6bd73ac1018..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-white.png
deleted file mode 100644
index dd43faec54a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/1x1-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-gg-rr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-gg-rr.png
deleted file mode 100644
index 84f5b2a4f1d..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-gg-rr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-green.png
deleted file mode 100644
index b3c8cf3eb4c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-red.png
deleted file mode 100644
index 823f125b8e4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/60x60-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/README b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/README
deleted file mode 100644
index 2e5f2ad0738..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/README
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Global Support Directory
-============================
-
-This directory contains common support files (such as images and external
-style sheets). These are sync'ed into the support directories of all our
-test suites. If you have test-suite-specific support files, please add
-them to the appropriate test-suite-specific support/ directory.
-
-If you add to a support/ directory, please run the tools/supportprop.py
-script from the top of the repository to cascade support files into the
-lower-level support directories.
-
-Description of the Common Support File Collection
--------------------------------------------------
-
-The 1x1-* images are all exactly one pixel.
-
-The swatch-* images all use 15x15 cells.
-
-The square-* images all use 15x15 cells with one pixel borders.
-
-The pattern-* images use cells of various sizes:
-
-   pattern-grg-rgr-grg.png   20x20
-   pattern-rgr-grg-rgr.png   20x20
-   pattern-tr.png            15x15
-   pattern-grg-rrg-rgg.png   15x15
-
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/a-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/a-green.css
deleted file mode 100644
index b0dbb071d5b..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/a-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.a { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/b-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/b-green.css
deleted file mode 100644
index a0473f5ca26..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/b-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.b { color: green; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/c-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/c-red.css
deleted file mode 100644
index d4ba5c64e95..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/c-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.c { color: red; }
\ No newline at end of file
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/cat.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/cat.png
deleted file mode 100644
index 85dd7324815..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/cat.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/import-green.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/import-green.css
deleted file mode 100644
index 537104e6633..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/import-green.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: green; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/import-red.css b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/import-red.css
deleted file mode 100644
index 9945ef47114..00000000000
--- a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/import-red.css
+++ /dev/null
@@ -1 +0,0 @@
-.import { color: red; }
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-grg-rgr-grg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-grg-rgr-grg.png
deleted file mode 100644
index 9b88fbd8114..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-grg-rgr-grg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-grg-rrg-rgg.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-grg-rrg-rgg.png
deleted file mode 100644
index fcf4f3fd7d9..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-grg-rrg-rgg.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-rgr-grg-rgr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-rgr-grg-rgr.png
deleted file mode 100644
index d454e3a630c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-rgr-grg-rgr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-tr.png
deleted file mode 100644
index 8b4b25364e0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/pattern-tr.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-h-50%.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-h-50%.png
deleted file mode 100644
index cf2eea6b438..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-h-50%.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-h-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-h-50px.png
deleted file mode 100644
index 9f46583665c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-h-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-v-100px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-v-100px.png
deleted file mode 100644
index a837eca2225..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-v-100px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-v-50px.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-v-50px.png
deleted file mode 100644
index 84141028020..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/ruler-v-50px.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-purple.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-purple.png
deleted file mode 100644
index 0f522d78728..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-purple.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-teal.png
deleted file mode 100644
index e567f51b91b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-white.png
deleted file mode 100644
index 5853cbb238c..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/square-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-blue.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-blue.png
deleted file mode 100644
index bf2759634d4..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-blue.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-green.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-green.png
deleted file mode 100644
index 0aa79b0c86b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-green.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-lime.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-lime.png
deleted file mode 100644
index 55fd7fdaedf..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-lime.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-orange.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-orange.png
deleted file mode 100644
index d3cd498b52b..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-orange.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-red.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-red.png
deleted file mode 100644
index 1caf25c992a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-red.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-teal.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-teal.png
deleted file mode 100644
index 0293ce89dea..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-teal.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-white.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-white.png
deleted file mode 100644
index 1a7d4323d77..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-white.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-yellow.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-yellow.png
deleted file mode 100644
index 1591aa0e2e2..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/swatch-yellow.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-bl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-bl.png
deleted file mode 100644
index 904e24e996a..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-bl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-br.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-br.png
deleted file mode 100644
index f413ff5c1a0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-br.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-inner-half-size.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-inner-half-size.png
deleted file mode 100644
index e473bf80efc..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-inner-half-size.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-outer.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-outer.png
deleted file mode 100644
index 82eeace7fc0..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-outer.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-tl.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-tl.png
deleted file mode 100644
index f6ac0ef7e8f..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-tl.png and /dev/null differ
diff --git a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-tr.png b/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-tr.png
deleted file mode 100644
index 59843ae54b6..00000000000
Binary files a/tests/wpt/css-tests/css-masking-1_dev/xhtml1print/support/test-tr.png and /dev/null differ
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 79b2d2d9799..88a32856ae8 100644
--- a/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/chapter-5.htm
@@ -1221,7 +1221,7 @@
       <tr id="class-selector-008-5.8.3" class="">
         <td>
             <a href="class-selector-008.htm">class-selector-008</a></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>CSS: Case Sensitive Classes
         </td>
@@ -2115,7 +2115,7 @@
       <tr id="first-line-pseudo-018-5.12.1" class="">
         <td>
             <a href="first-line-pseudo-018.htm">first-line-pseudo-018</a></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
         <td></td>
         <td>Basic :first-line test
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/html4/class-selector-008.htm b/tests/wpt/css-tests/css21_dev/html4/class-selector-008.htm
index c8ef876bb28..f0adc46fac6 100644
--- a/tests/wpt/css-tests/css21_dev/html4/class-selector-008.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/class-selector-008.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/class/001.html" type="text/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#class-html">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
    .teST { color: green; }
    .TEst { background: red; color: yellow; } /* doesn't apply */
diff --git a/tests/wpt/css-tests/css21_dev/html4/first-line-pseudo-018.htm b/tests/wpt/css-tests/css21_dev/html4/first-line-pseudo-018.htm
index e64e2c89340..c2168669c28 100644
--- a/tests/wpt/css-tests/css21_dev/html4/first-line-pseudo-018.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/first-line-pseudo-018.htm
@@ -6,6 +6,7 @@
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.xml" type="application/xhtml+xml">
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.html" type="type/html">
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo">
+  <link rel="match" href="reference/ref-this-text-should-be-green.htm">
   <style type="text/css">
    p:first-line	{ color: green; }
   </style>
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 c3b4f78c9a5..b5d2c80f11c 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
+++ b/tests/wpt/css-tests/css21_dev/html4/reftest-toc.htm
@@ -21268,6 +21268,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="class-selector-008" class="">
+      <tr>
+        <td rowspan="1" title="CSS: Case Sensitive Classes">
+          <a href="class-selector-008.htm">class-selector-008</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="clear-001" class="">
       <tr>
         <td rowspan="1" title="Clear set to 'left'">
@@ -29156,6 +29164,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may" title="Behavior tested is preferred but optional">Optional</abbr></td>
       </tr>
     </tbody>
+    <tbody id="first-line-pseudo-018" class="">
+      <tr>
+        <td rowspan="1" title="Basic :first-line test">
+          <a href="first-line-pseudo-018.htm">first-line-pseudo-018</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.htm">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="first-line-selector-013" class="">
       <tr>
         <td rowspan="1" title="First-line selector applicability to inline-blocks">
diff --git a/tests/wpt/css-tests/css21_dev/html4/reftest.list b/tests/wpt/css-tests/css21_dev/html4/reftest.list
index 614defdd865..06b98b128f9 100644
--- a/tests/wpt/css-tests/css21_dev/html4/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/html4/reftest.list
@@ -2694,6 +2694,7 @@ class-selector-004.htm == reference/no-red-filler-text-ref.htm
 class-selector-005.htm == reference/no-red-filler-text-ref.htm
 class-selector-006.htm == reference/filler-text-below-green.htm
 class-selector-007.htm == reference/no-red-filler-text-ref.htm
+class-selector-008.htm == reference/ref-this-text-should-be-green.htm
 clear-001.htm == reference/clear-001-ref.htm
 clear-002.htm == reference/clear-002-ref.htm
 clear-003.htm == reference/clear-003-ref.htm
@@ -3680,6 +3681,7 @@ first-line-pseudo-013.htm == reference/first-line-pseudo-013-ref.htm
 first-line-pseudo-014.htm == reference/first-line-pseudo-013-ref.htm
 first-line-pseudo-015.htm == reference/first-line-pseudo-015-ref.htm
 first-line-pseudo-016.htm == reference/first-line-pseudo-015-ref.htm
+first-line-pseudo-018.htm == reference/ref-this-text-should-be-green.htm
 first-line-selector-013.htm == reference/filler-text-below-green.htm
 fixed-table-layout-002a.htm == reference/fixed-table-layout-002a-ref.htm
 fixed-table-layout-003a01.htm == reference/fixed-table-layout-003a01-ref.htm
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 4eb1363e321..95a456968fc 100644
--- a/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css21_dev/implementation-report-TEMPLATE.data
@@ -7993,8 +7993,8 @@ html4/class-selector-006.htm	15e231993148d75714ba69e1837865a9c29f9f11	?
 xhtml1/class-selector-006.xht	15e231993148d75714ba69e1837865a9c29f9f11	?
 html4/class-selector-007.htm	1357853035adb3c5d28e8717eb0214387bce2e77	?
 xhtml1/class-selector-007.xht	1357853035adb3c5d28e8717eb0214387bce2e77	?
-html4/class-selector-008.htm	5d6091072ef0371c7b12b89ae60b734dbbfd2818	?
-xhtml1/class-selector-008.xht	5d6091072ef0371c7b12b89ae60b734dbbfd2818	?
+html4/class-selector-008.htm	63e37ed2f4779f3dbc660162fa5592d73f3d4961	?
+xhtml1/class-selector-008.xht	63e37ed2f4779f3dbc660162fa5592d73f3d4961	?
 html4/class-selector-009.htm	3b6b7ef30229e635a56015ff770c06b9e8843c18	?
 xhtml1/class-selector-009.xht	3b6b7ef30229e635a56015ff770c06b9e8843c18	?
 html4/class-selector-010.htm	a070f58b96e0aa4c7de7d78e204834ad34aa835d	?
@@ -10967,8 +10967,8 @@ html4/first-line-pseudo-016.htm	c1cb9487ca6897bd91db0e30a0ce49c533107156	?
 xhtml1/first-line-pseudo-016.xht	c1cb9487ca6897bd91db0e30a0ce49c533107156	?
 html4/first-line-pseudo-017.htm	11352f610475249d323123bab80dd30524b81c13	?
 xhtml1/first-line-pseudo-017.xht	11352f610475249d323123bab80dd30524b81c13	?
-html4/first-line-pseudo-018.htm	03e8bac36c46d0c6f79b5e3dba41eed6bf793af9	?
-xhtml1/first-line-pseudo-018.xht	03e8bac36c46d0c6f79b5e3dba41eed6bf793af9	?
+html4/first-line-pseudo-018.htm	704417a84b15902096caeea659a82f96c68cfc61	?
+xhtml1/first-line-pseudo-018.xht	704417a84b15902096caeea659a82f96c68cfc61	?
 html4/first-line-pseudo-019.htm	4a73153e0c8db5106ac1ba0c6a4177145ad3de0d	?
 xhtml1/first-line-pseudo-019.xht	4a73153e0c8db5106ac1ba0c6a4177145ad3de0d	?
 html4/first-line-pseudo-020.htm	cbd72ae6083c8c785252e3df2ae9accff560519a	?
diff --git a/tests/wpt/css-tests/css21_dev/testinfo.data b/tests/wpt/css-tests/css21_dev/testinfo.data
index 98a3a325098..b8f327b7505 100644
--- a/tests/wpt/css-tests/css21_dev/testinfo.data
+++ b/tests/wpt/css-tests/css21_dev/testinfo.data
@@ -4017,7 +4017,7 @@ class-selector-004	reference/no-red-filler-text-ref	Invalid class selectors with
 class-selector-005	reference/no-red-filler-text-ref	Invalid class selectors with a carriage return between the "." and the class name	invalid	http://www.w3.org/TR/CSS21/selector.html#class-html	af4bf11b0d220ab272afe770292d92071d4e7af5	`Microsoft`<http://www.microsoft.com/>	The attribute value of a class selector followed by white space is invalid.
 class-selector-006	reference/filler-text-below-green	Multiple class selectors		http://www.w3.org/TR/CSS21/selector.html#class-html	15e231993148d75714ba69e1837865a9c29f9f11	`Microsoft`<http://www.microsoft.com/>	All class names in the selector need to match all of the 'class' attribute values.
 class-selector-007	reference/no-red-filler-text-ref	Multiple class selectors and missing class values		http://www.w3.org/TR/CSS21/selector.html#class-html	1357853035adb3c5d28e8717eb0214387bce2e77	`Microsoft`<http://www.microsoft.com/>	All class names in the selector need to match all of the 'class' attribute values.
-class-selector-008		CSS: Case Sensitive Classes		http://www.w3.org/TR/CSS21/selector.html#class-html	5d6091072ef0371c7b12b89ae60b734dbbfd2818	`Ian Hickson`<mailto:ian@hixie.ch>	
+class-selector-008	reference/ref-this-text-should-be-green	CSS: Case Sensitive Classes		http://www.w3.org/TR/CSS21/selector.html#class-html	63e37ed2f4779f3dbc660162fa5592d73f3d4961	`Ian Hickson`<mailto:ian@hixie.ch>	
 class-selector-009		Multiple classes		http://www.w3.org/TR/CSS21/selector.html#class-html	3b6b7ef30229e635a56015ff770c06b9e8843c18	`Ian Hickson`<mailto:ian@hixie.ch>	
 class-selector-010		Multiple classes		http://www.w3.org/TR/CSS21/selector.html#class-html	a070f58b96e0aa4c7de7d78e204834ad34aa835d	`Ian Hickson`<mailto:ian@hixie.ch>	
 class-selector-011		Multiple classes		http://www.w3.org/TR/CSS21/selector.html#class-html	347f975178f05c3a8f8dd685d94293041b79dd2d	`Ian Hickson`<mailto:ian@hixie.ch>	
@@ -5508,7 +5508,7 @@ first-line-pseudo-014	reference/first-line-pseudo-013-ref	vertical-align: top on
 first-line-pseudo-015	reference/first-line-pseudo-015-ref	vertical-align: bottom on :first-line	ahem,may	http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	39f5446b6fd7162f22b7bda1b5f5a8e4286a9ed8	`Ian Hickson`<mailto:ian@hixie.ch>	
 first-line-pseudo-016	reference/first-line-pseudo-015-ref	vertical-align: bottom on :first-line	ahem,may	http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	c1cb9487ca6897bd91db0e30a0ce49c533107156	`Ian Hickson`<mailto:ian@hixie.ch>	
 first-line-pseudo-017		First-Line: Innermost vs outermost		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	11352f610475249d323123bab80dd30524b81c13	`Ian Hickson`<mailto:ian@hixie.ch>	
-first-line-pseudo-018		Basic :first-line test		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	03e8bac36c46d0c6f79b5e3dba41eed6bf793af9	`Ian Hickson`<mailto:ian@hixie.ch>	
+first-line-pseudo-018	reference/ref-this-text-should-be-green	Basic :first-line test		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	704417a84b15902096caeea659a82f96c68cfc61	`Ian Hickson`<mailto:ian@hixie.ch>	
 first-line-pseudo-019		Basic :first-line test		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	4a73153e0c8db5106ac1ba0c6a4177145ad3de0d	`Ian Hickson`<mailto:ian@hixie.ch>	
 first-line-pseudo-020		Basic :first-line test		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	cbd72ae6083c8c785252e3df2ae9accff560519a	`Ian Hickson`<mailto:ian@hixie.ch>	
 first-line-pseudo-021		First-Line: Inheritance		http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo	46b22da755a78d47b4f40ec8bcd4881888d3f403	`Ian Hickson`<mailto:ian@hixie.ch>	
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 4174d56357a..e913af114ae 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
@@ -1199,7 +1199,7 @@
       <tr id="class-selector-008-5.8.3" class="">
         <td>
             <a href="class-selector-008.xht">class-selector-008</a></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>CSS: Case Sensitive Classes
         </td>
@@ -2093,7 +2093,7 @@
       <tr id="first-line-pseudo-018-5.12.1" class="">
         <td>
             <a href="first-line-pseudo-018.xht">first-line-pseudo-018</a></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Basic :first-line test
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/class-selector-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1/class-selector-008.xht
index 5b4b8cd33c1..2232d65ff44 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/class-selector-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/class-selector-008.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/class/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#class-html" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">
    .teST { color: green; }
    .TEst { background: red; color: yellow; } /* doesn't apply */
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/first-line-pseudo-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1/first-line-pseudo-018.xht
index 8f8dfd7f2ba..92e6b361369 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/first-line-pseudo-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/first-line-pseudo-018.xht
@@ -6,6 +6,7 @@
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.xml" type="application/xhtml+xml"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.html" type="type/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
    p:first-line	{ color: green; }
   </style>
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 fb5f7f34eed..7629744f879 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
@@ -21500,6 +21500,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="class-selector-008" class="">
+      <tr>
+        <td rowspan="1" title="CSS: Case Sensitive Classes">
+          <a href="class-selector-008.xht">class-selector-008</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="clear-001" class="">
       <tr>
         <td rowspan="1" title="Clear set to 'left'">
@@ -29388,6 +29396,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may" title="Behavior tested is preferred but optional">Optional</abbr></td>
       </tr>
     </tbody>
+    <tbody id="first-line-pseudo-018" class="">
+      <tr>
+        <td rowspan="1" title="Basic :first-line test">
+          <a href="first-line-pseudo-018.xht">first-line-pseudo-018</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="first-line-selector-013" class="">
       <tr>
         <td rowspan="1" title="First-line selector applicability to inline-blocks">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
index 63db8415e79..a2238ce629d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
@@ -2694,6 +2694,7 @@ class-selector-004.xht == reference/no-red-filler-text-ref.xht
 class-selector-005.xht == reference/no-red-filler-text-ref.xht
 class-selector-006.xht == reference/filler-text-below-green.xht
 class-selector-007.xht == reference/no-red-filler-text-ref.xht
+class-selector-008.xht == reference/ref-this-text-should-be-green.xht
 clear-001.xht == reference/clear-001-ref.xht
 clear-002.xht == reference/clear-002-ref.xht
 clear-003.xht == reference/clear-003-ref.xht
@@ -3680,6 +3681,7 @@ first-line-pseudo-013.xht == reference/first-line-pseudo-013-ref.xht
 first-line-pseudo-014.xht == reference/first-line-pseudo-013-ref.xht
 first-line-pseudo-015.xht == reference/first-line-pseudo-015-ref.xht
 first-line-pseudo-016.xht == reference/first-line-pseudo-015-ref.xht
+first-line-pseudo-018.xht == reference/ref-this-text-should-be-green.xht
 first-line-selector-013.xht == reference/filler-text-below-green.xht
 fixed-table-layout-002a.xht == reference/fixed-table-layout-002a-ref.xht
 fixed-table-layout-003a01.xht == reference/fixed-table-layout-003a01-ref.xht
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 4174d56357a..e913af114ae 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/chapter-5.xht
@@ -1199,7 +1199,7 @@
       <tr id="class-selector-008-5.8.3" class="">
         <td>
             <a href="class-selector-008.xht">class-selector-008</a></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>CSS: Case Sensitive Classes
         </td>
@@ -2093,7 +2093,7 @@
       <tr id="first-line-pseudo-018-5.12.1" class="">
         <td>
             <a href="first-line-pseudo-018.xht">first-line-pseudo-018</a></td>
-        <td></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
         <td></td>
         <td>Basic :first-line test
         </td>
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/class-selector-008.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/class-selector-008.xht
index fc5997ea8f2..bdf3cc94689 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/class-selector-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/class-selector-008.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/class/001.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#class-html" />
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht" />
   <style type="text/css">
    .teST { color: green; }
    .TEst { background: red; color: yellow; } /* doesn't apply */
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/first-line-pseudo-018.xht b/tests/wpt/css-tests/css21_dev/xhtml1print/first-line-pseudo-018.xht
index 55ee5e48e54..c85190d6173 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/first-line-pseudo-018.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/first-line-pseudo-018.xht
@@ -15,6 +15,7 @@
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.xml" type="application/xhtml+xml"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.html" type="type/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo"/>
+  <link rel="match" href="reference/ref-this-text-should-be-green.xht"/>
   <style type="text/css">
    p:first-line	{ color: green; }
   </style>
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 fb5f7f34eed..7629744f879 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest-toc.xht
@@ -21500,6 +21500,14 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
+    <tbody id="class-selector-008" class="">
+      <tr>
+        <td rowspan="1" title="CSS: Case Sensitive Classes">
+          <a href="class-selector-008.xht">class-selector-008</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="clear-001" class="">
       <tr>
         <td rowspan="1" title="Clear set to 'left'">
@@ -29388,6 +29396,14 @@
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr><abbr class="may" title="Behavior tested is preferred but optional">Optional</abbr></td>
       </tr>
     </tbody>
+    <tbody id="first-line-pseudo-018" class="">
+      <tr>
+        <td rowspan="1" title="Basic :first-line test">
+          <a href="first-line-pseudo-018.xht">first-line-pseudo-018</a></td>
+        <td><a href="reference/ref-this-text-should-be-green.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
     <tbody id="first-line-selector-013" class="">
       <tr>
         <td rowspan="1" title="First-line selector applicability to inline-blocks">
diff --git a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
index 63db8415e79..a2238ce629d 100644
--- a/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1print/reftest.list
@@ -2694,6 +2694,7 @@ class-selector-004.xht == reference/no-red-filler-text-ref.xht
 class-selector-005.xht == reference/no-red-filler-text-ref.xht
 class-selector-006.xht == reference/filler-text-below-green.xht
 class-selector-007.xht == reference/no-red-filler-text-ref.xht
+class-selector-008.xht == reference/ref-this-text-should-be-green.xht
 clear-001.xht == reference/clear-001-ref.xht
 clear-002.xht == reference/clear-002-ref.xht
 clear-003.xht == reference/clear-003-ref.xht
@@ -3680,6 +3681,7 @@ first-line-pseudo-013.xht == reference/first-line-pseudo-013-ref.xht
 first-line-pseudo-014.xht == reference/first-line-pseudo-013-ref.xht
 first-line-pseudo-015.xht == reference/first-line-pseudo-015-ref.xht
 first-line-pseudo-016.xht == reference/first-line-pseudo-015-ref.xht
+first-line-pseudo-018.xht == reference/ref-this-text-should-be-green.xht
 first-line-selector-013.xht == reference/filler-text-below-green.xht
 fixed-table-layout-002a.xht == reference/fixed-table-layout-002a-ref.xht
 fixed-table-layout-003a01.xht == reference/fixed-table-layout-003a01-ref.xht
diff --git a/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-001.htm b/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-001.htm
index ddfd70e2386..51615398aef 100644
--- a/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-001.htm
+++ b/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-001.htm
@@ -25,8 +25,8 @@
             m12: 0, m22: 2, m32: 0, m42: 10,
             m13: 0, m23: 0, m33: 1, m43: 0,
             m14: 0, m24: 0, m34: 0, m44: 1,
-            is2D: true,
-            isIdentity: true
+            is2D: false,
+            isIdentity: false
         };
 
         test(function() {
@@ -41,7 +41,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0);
-            checkDOMMatrix(new DOMMatrix(float32Array), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(float32Array), scaleTranslate2D, false);
         },'testConstructor2');
         test(function() {
             var float32Array = new Float32Array(2.0, 0.0, 0.0, 2.0, 10.0, 10.0);
@@ -53,7 +53,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0]);
-            checkDOMMatrix(new DOMMatrix(float64Array), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(float64Array), scaleTranslate2D, false);
         },'testConstructor4');
         test(function() {
             var float64Array = new Float64Array(2.0, 0.0, 0.0, 2.0, 10.0, 10.0);
@@ -65,7 +65,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0];
-            checkDOMMatrix(new DOMMatrix(sequence), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(sequence), scaleTranslate2D, false);
         },'testConstructor6');
         test(function() {
             var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0, 10.0];
@@ -134,11 +134,14 @@
             assert_throws(new TypeError(), function() { new DOMMatrixReadOnly(string); });
         },'testConstructorIllegal1');
         test(function() {
-            var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0, 10.0];
+            var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0];
             assert_throws(new TypeError(), function() { new DOMMatrixReadOnly(sequence); });
         },'testConstructorIllegal2');
 
-        function checkDOMMatrix(m, exp) {
+        function checkDOMMatrix(m, exp, is2D) {
+            if (is2D === undefined) {
+              is2D = exp.is2D;
+            }
             assert_equals(m.m11, exp.m11, "Expected value for m11 is " + exp.m11);
             assert_equals(m.m12, exp.m12, "Expected value for m12 is " + exp.m12);
             assert_equals(m.m13, exp.m13, "Expected value for m13 is " + exp.m13);
@@ -155,7 +158,7 @@
             assert_equals(m.m42, exp.m42, "Expected value for m42 is " + exp.m42);
             assert_equals(m.m43, exp.m43, "Expected value for m43 is " + exp.m43);
             assert_equals(m.m44, exp.m44, "Expected value for m44 is " + exp.m44);
-            assert_equals(m.is2D, exp.is2D, "Expected value for is2D is " + exp.is2D);
+            assert_equals(m.is2D, is2D, "Expected value for is2D is " + is2D);
             assert_equals(m.isIdentity, exp.isIdentity, "Expected value for isIdentity is " + exp.isIdentity);
         }
 
diff --git a/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-002.htm b/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-002.htm
new file mode 100644
index 00000000000..cdbcf39639d
--- /dev/null
+++ b/tests/wpt/css-tests/geometry-1_dev/html/DOMMatrix-002.htm
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html><head>
+    <title>Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object</title>
+    <link href="mailto:peter.hall@algomi.com" rel="author" title="Peter Hall">
+    <link href="https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly" rel="help">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+    <p>Test DOMMatrixReadOnly methods do not mutate the object</p>
+    <div id="log"></div>
+    <script>
+
+        function initialMatrix(){
+          return DOMMatrixReadOnly.fromMatrix(
+            {
+              m11:1,   m12:-0.5, m13: 0.5,  m14:0,
+              m21:0.5, m22:2,    m23: -0.5, m24:0,
+              m31:0,   m32:0,    m33: 1,    m34:0,
+              m41:0,   m42:0,    m43: 0,    m44:1,
+              is2D: false
+            }
+          );
+        }
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.translate(1,5,3);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test translate() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.scale(1,5,3,0,1,3);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test scale() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.scale3d(3,2,1,1);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test scale3d() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotate(Math.PI, Math.PI/2, Math.PI/6);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotate() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotateFromVector(10,-4);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotateFromVector() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotateAxisAngle(3,4,5, Math.PI/6);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotateAxisAngle() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.skewX(20);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test skewX() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.skewY(20);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test skewY() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.multiply({ m11:1, m12:2, m13: 0, m14:0,
+                            m21:-1, m22:2, m23: -1, m24:0,
+                            m31:0, m32:0, m33: 1, m34:0,
+                            m41:5, m42:0, m43: 2, m44:1,
+                            is2D: false,
+                            isIdentity:false });
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test multiply() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.flipX();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test flipX() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.flipY();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test flipY() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.inverse();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test inverse() doesn't mutate");
+
+        function checkDOMMatrix(m, exp) {
+            assert_equals(m.m11, exp.m11, "Expected value for m11 is " + exp.m11);
+            assert_equals(m.m12, exp.m12, "Expected value for m12 is " + exp.m12);
+            assert_equals(m.m13, exp.m13, "Expected value for m13 is " + exp.m13);
+            assert_equals(m.m14, exp.m14, "Expected value for m14 is " + exp.m14);
+            assert_equals(m.m21, exp.m21, "Expected value for m21 is " + exp.m21);
+            assert_equals(m.m22, exp.m22, "Expected value for m22 is " + exp.m22);
+            assert_equals(m.m23, exp.m23, "Expected value for m23 is " + exp.m23);
+            assert_equals(m.m24, exp.m24, "Expected value for m24 is " + exp.m24);
+            assert_equals(m.m31, exp.m31, "Expected value for m31 is " + exp.m31);
+            assert_equals(m.m32, exp.m32, "Expected value for m32 is " + exp.m32);
+            assert_equals(m.m33, exp.m33, "Expected value for m33 is " + exp.m33);
+            assert_equals(m.m34, exp.m34, "Expected value for m34 is " + exp.m34);
+            assert_equals(m.m41, exp.m41, "Expected value for m41 is " + exp.m41);
+            assert_equals(m.m42, exp.m42, "Expected value for m42 is " + exp.m42);
+            assert_equals(m.m43, exp.m43, "Expected value for m43 is " + exp.m43);
+            assert_equals(m.m44, exp.m44, "Expected value for m44 is " + exp.m44);
+            assert_equals(m.is2D, exp.is2D, "Expected value for is2D is " + exp.is2D);
+            assert_equals(m.isIdentity, exp.isIdentity, "Expected value for isIdentity is " + exp.isIdentity);
+        }
+    </script>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/geometry-1_dev/html/chapter-6.htm b/tests/wpt/css-tests/geometry-1_dev/html/chapter-6.htm
index 997c3381bcc..0e1b8c129d4 100644
--- a/tests/wpt/css-tests/geometry-1_dev/html/chapter-6.htm
+++ b/tests/wpt/css-tests/geometry-1_dev/html/chapter-6.htm
@@ -13,7 +13,7 @@
  <body>
 
   <h1>Geometry Interfaces Module Level 1 CR Test Suite</h1>
-  <h2>The DOMMatrix interfaces (1 tests)</h2>
+  <h2>The DOMMatrix interfaces (2 tests)</h2>
   <table width="100%">
     <col id="test-column">
     <col id="refs-column">
@@ -150,7 +150,15 @@
       <!-- 0 tests -->
     </tbody>
     <tbody id="s6.#dom-dommatrixreadonly">
-      <!-- 0 tests -->
+      <!-- 1 tests -->
+      <tr id="dommatrix-002-6.#dom-dommatrixreadonly" class="primary script">
+        <td><strong>
+            <a href="DOMMatrix-002.htm">dommatrix-002</a></strong></td>
+        <td></td>
+        <td><abbr class="script" title="Executes tests in script">Script</abbr></td>
+        <td>Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object
+        </td>
+      </tr>
     </tbody>
     <tbody id="s6.#dom-dommatrixreadonly-dommatrixreadonly-numbersequence">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/geometry-1_dev/html/toc.htm b/tests/wpt/css-tests/geometry-1_dev/html/toc.htm
index 682ae851531..322290b7aff 100644
--- a/tests/wpt/css-tests/geometry-1_dev/html/toc.htm
+++ b/tests/wpt/css-tests/geometry-1_dev/html/toc.htm
@@ -47,7 +47,7 @@
     <tbody id="s6">
       <tr><th><a href="chapter-6.htm">Chapter 6 - 
         The DOMMatrix interfaces</a></th>
-      <td>(1 Tests)</td></tr>
+      <td>(2 Tests)</td></tr>
     </tbody>
     <tbody id="s7">
       <tr><th><a href="chapter-7.htm">Chapter 7 - 
diff --git a/tests/wpt/css-tests/geometry-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/geometry-1_dev/implementation-report-TEMPLATE.data
index 8eed0ec5add..0deae424863 100644
--- a/tests/wpt/css-tests/geometry-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/geometry-1_dev/implementation-report-TEMPLATE.data
@@ -3,8 +3,10 @@
 # http://test.csswg.org/suites/geometry-1_dev/DATESTAMP/
 # See http://wiki.csswg.org/test/implementation-report for instructions
 testname	revision	result	comment
-html/dommatrix-001.htm	073bb957a964c40741226edda571b0051fde11d7	?
-xhtml1/dommatrix-001.xht	073bb957a964c40741226edda571b0051fde11d7	?
+html/dommatrix-001.htm	094c92af86543bc344ff68969950c23137ecb1de	?
+xhtml1/dommatrix-001.xht	094c92af86543bc344ff68969950c23137ecb1de	?
+html/dommatrix-002.htm	fce1ff735543f8c1b50b650fd26ce2e1e1f40026	?
+xhtml1/dommatrix-002.xht	fce1ff735543f8c1b50b650fd26ce2e1e1f40026	?
 html/dompoint-001.htm	665e2664c436ff50a27f1ab0532d656205e7f441	?
 xhtml1/dompoint-001.xht	665e2664c436ff50a27f1ab0532d656205e7f441	?
 html/domquad-001.htm	608cb7264f7f7f64838baf911bf9e470cf89444c	?
diff --git a/tests/wpt/css-tests/geometry-1_dev/index.htm b/tests/wpt/css-tests/geometry-1_dev/index.htm
index b234e8c7f80..fc0094277cd 100644
--- a/tests/wpt/css-tests/geometry-1_dev/index.htm
+++ b/tests/wpt/css-tests/geometry-1_dev/index.htm
@@ -132,6 +132,7 @@
   <p>Many thanks to the following for their contributions:</p>
   <ul>
     <li>Dirk Schulze</li>
+    <li>Peter Hall</li>
   </ul>
 
 </body>
diff --git a/tests/wpt/css-tests/geometry-1_dev/index.xht b/tests/wpt/css-tests/geometry-1_dev/index.xht
index 82ec8a9a3af..e20081ca7b5 100644
--- a/tests/wpt/css-tests/geometry-1_dev/index.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/index.xht
@@ -132,6 +132,7 @@
   <p>Many thanks to the following for their contributions:</p>
   <ul>
     <li>Dirk Schulze</li>
+    <li>Peter Hall</li>
   </ul>
 
 </body>
diff --git a/tests/wpt/css-tests/geometry-1_dev/testinfo.data b/tests/wpt/css-tests/geometry-1_dev/testinfo.data
index 3e1e4097d89..d72f0122f68 100644
--- a/tests/wpt/css-tests/geometry-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/geometry-1_dev/testinfo.data
@@ -1,5 +1,6 @@
 id	references	title	flags	links	revision	credits	assertion
-DOMMatrix-001		Geometry Interfaces: DOMMatrix and DOMMatrixReadOnly constructors	script	http://www.w3.org/TR/geometry-1/#DOMMatrix,http://www.w3.org/TR/geometry-1/#dommatrix-constructors,http://www.w3.org/TR/geometry-1/#dom-dommatrix-dommatrix	073bb957a964c40741226edda571b0051fde11d7	`Dirk Schulze`<mailto:dschulze@adobe.com>	
+DOMMatrix-001		Geometry Interfaces: DOMMatrix and DOMMatrixReadOnly constructors	script	http://www.w3.org/TR/geometry-1/#DOMMatrix,http://www.w3.org/TR/geometry-1/#dommatrix-constructors,http://www.w3.org/TR/geometry-1/#dom-dommatrix-dommatrix	094c92af86543bc344ff68969950c23137ecb1de	`Dirk Schulze`<mailto:dschulze@adobe.com>	
+DOMMatrix-002		Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object	script	https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly	fce1ff735543f8c1b50b650fd26ce2e1e1f40026	`Peter Hall`<mailto:peter.hall@algomi.com>	
 DOMPoint-001		Geometry Interfaces: DOMPoint and DOMPointReadOnly interface tests	script	http://www.w3.org/TR/geometry-1/#DOMPoint,http://www.w3.org/TR/geometry-1/#dictdef-dompointinit,http://www.w3.org/TR/geometry-1/#dom-dompoint-dompoint,http://www.w3.org/TR/geometry-1/#dom-dompointreadonly-dompoint-x,http://www.w3.org/TR/geometry-1/#dom-dompointreadonly-dompoint-y,http://www.w3.org/TR/geometry-1/#dom-dompointreadonly-dompoint-z,http://www.w3.org/TR/geometry-1/#dom-dompointreadonly-dompoint-w	665e2664c436ff50a27f1ab0532d656205e7f441	`Dirk Schulze`<mailto:dschulze@adobe.com>	
 DOMQuad-001		Geometry Interfaces: DOMQuad interface tests	script	http://www.w3.org/TR/geometry-1/#DOMQuad,http://www.w3.org/TR/geometry-1/#dom-domquad-domquad,http://www.w3.org/TR/geometry-1/#dom-domquad-p1,http://www.w3.org/TR/geometry-1/#dom-domquad-p2,http://www.w3.org/TR/geometry-1/#dom-domquad-p3,http://www.w3.org/TR/geometry-1/#dom-domquad-p4,http://www.w3.org/TR/geometry-1/#dom-domquad-bounds	608cb7264f7f7f64838baf911bf9e470cf89444c	`Dirk Schulze`<mailto:dschulze@adobe.com>	
 DOMRect-001		Geometry Interfaces: DOMRect and DOMRectReadOnly interface tests	script	http://www.w3.org/TR/geometry-1/#DOMRect,http://www.w3.org/TR/geometry-1/#dom-domrect,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly,http://www.w3.org/TR/geometry-1/#dom-domrect-domrect,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-x,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-y,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-width,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-height,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-top,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-left,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-right,http://www.w3.org/TR/geometry-1/#dom-domrectreadonly-domrect-bottom	2683301224ae44225ab87152ac19e1cd866f59ae	`Dirk Schulze`<mailto:dschulze@adobe.com>	
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-001.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-001.xht
index 705fe98546f..8511ff2ff57 100644
--- a/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-001.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-001.xht
@@ -25,8 +25,8 @@
             m12: 0, m22: 2, m32: 0, m42: 10,
             m13: 0, m23: 0, m33: 1, m43: 0,
             m14: 0, m24: 0, m34: 0, m44: 1,
-            is2D: true,
-            isIdentity: true
+            is2D: false,
+            isIdentity: false
         };
 
         test(function() {
@@ -41,7 +41,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0);
-            checkDOMMatrix(new DOMMatrix(float32Array), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(float32Array), scaleTranslate2D, false);
         },'testConstructor2');
         test(function() {
             var float32Array = new Float32Array(2.0, 0.0, 0.0, 2.0, 10.0, 10.0);
@@ -53,7 +53,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0]);
-            checkDOMMatrix(new DOMMatrix(float64Array), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(float64Array), scaleTranslate2D, false);
         },'testConstructor4');
         test(function() {
             var float64Array = new Float64Array(2.0, 0.0, 0.0, 2.0, 10.0, 10.0);
@@ -65,7 +65,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0];
-            checkDOMMatrix(new DOMMatrix(sequence), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(sequence), scaleTranslate2D, false);
         },'testConstructor6');
         test(function() {
             var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0, 10.0];
@@ -134,11 +134,14 @@
             assert_throws(new TypeError(), function() { new DOMMatrixReadOnly(string); });
         },'testConstructorIllegal1');
         test(function() {
-            var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0, 10.0];
+            var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0];
             assert_throws(new TypeError(), function() { new DOMMatrixReadOnly(sequence); });
         },'testConstructorIllegal2');
 
-        function checkDOMMatrix(m, exp) {
+        function checkDOMMatrix(m, exp, is2D) {
+            if (is2D === undefined) {
+              is2D = exp.is2D;
+            }
             assert_equals(m.m11, exp.m11, "Expected value for m11 is " + exp.m11);
             assert_equals(m.m12, exp.m12, "Expected value for m12 is " + exp.m12);
             assert_equals(m.m13, exp.m13, "Expected value for m13 is " + exp.m13);
@@ -155,7 +158,7 @@
             assert_equals(m.m42, exp.m42, "Expected value for m42 is " + exp.m42);
             assert_equals(m.m43, exp.m43, "Expected value for m43 is " + exp.m43);
             assert_equals(m.m44, exp.m44, "Expected value for m44 is " + exp.m44);
-            assert_equals(m.is2D, exp.is2D, "Expected value for is2D is " + exp.is2D);
+            assert_equals(m.is2D, is2D, "Expected value for is2D is " + is2D);
             assert_equals(m.isIdentity, exp.isIdentity, "Expected value for isIdentity is " + exp.isIdentity);
         }
 
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-002.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-002.xht
new file mode 100644
index 00000000000..ebb5cb35679
--- /dev/null
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1/DOMMatrix-002.xht
@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+    <title>Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object</title>
+    <link href="mailto:peter.hall@algomi.com" rel="author" title="Peter Hall" />
+    <link href="https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly" rel="help" />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+    <p>Test DOMMatrixReadOnly methods do not mutate the object</p>
+    <div id="log"></div>
+    <script>
+
+        function initialMatrix(){
+          return DOMMatrixReadOnly.fromMatrix(
+            {
+              m11:1,   m12:-0.5, m13: 0.5,  m14:0,
+              m21:0.5, m22:2,    m23: -0.5, m24:0,
+              m31:0,   m32:0,    m33: 1,    m34:0,
+              m41:0,   m42:0,    m43: 0,    m44:1,
+              is2D: false
+            }
+          );
+        }
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.translate(1,5,3);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test translate() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.scale(1,5,3,0,1,3);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test scale() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.scale3d(3,2,1,1);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test scale3d() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotate(Math.PI, Math.PI/2, Math.PI/6);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotate() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotateFromVector(10,-4);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotateFromVector() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotateAxisAngle(3,4,5, Math.PI/6);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotateAxisAngle() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.skewX(20);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test skewX() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.skewY(20);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test skewY() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.multiply({ m11:1, m12:2, m13: 0, m14:0,
+                            m21:-1, m22:2, m23: -1, m24:0,
+                            m31:0, m32:0, m33: 1, m34:0,
+                            m41:5, m42:0, m43: 2, m44:1,
+                            is2D: false,
+                            isIdentity:false });
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test multiply() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.flipX();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test flipX() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.flipY();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test flipY() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.inverse();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test inverse() doesn't mutate");
+
+        function checkDOMMatrix(m, exp) {
+            assert_equals(m.m11, exp.m11, "Expected value for m11 is " + exp.m11);
+            assert_equals(m.m12, exp.m12, "Expected value for m12 is " + exp.m12);
+            assert_equals(m.m13, exp.m13, "Expected value for m13 is " + exp.m13);
+            assert_equals(m.m14, exp.m14, "Expected value for m14 is " + exp.m14);
+            assert_equals(m.m21, exp.m21, "Expected value for m21 is " + exp.m21);
+            assert_equals(m.m22, exp.m22, "Expected value for m22 is " + exp.m22);
+            assert_equals(m.m23, exp.m23, "Expected value for m23 is " + exp.m23);
+            assert_equals(m.m24, exp.m24, "Expected value for m24 is " + exp.m24);
+            assert_equals(m.m31, exp.m31, "Expected value for m31 is " + exp.m31);
+            assert_equals(m.m32, exp.m32, "Expected value for m32 is " + exp.m32);
+            assert_equals(m.m33, exp.m33, "Expected value for m33 is " + exp.m33);
+            assert_equals(m.m34, exp.m34, "Expected value for m34 is " + exp.m34);
+            assert_equals(m.m41, exp.m41, "Expected value for m41 is " + exp.m41);
+            assert_equals(m.m42, exp.m42, "Expected value for m42 is " + exp.m42);
+            assert_equals(m.m43, exp.m43, "Expected value for m43 is " + exp.m43);
+            assert_equals(m.m44, exp.m44, "Expected value for m44 is " + exp.m44);
+            assert_equals(m.is2D, exp.is2D, "Expected value for is2D is " + exp.is2D);
+            assert_equals(m.isIdentity, exp.isIdentity, "Expected value for isIdentity is " + exp.isIdentity);
+        }
+    </script>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1/chapter-6.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1/chapter-6.xht
index 5a470f78a80..f2b62605bda 100644
--- a/tests/wpt/css-tests/geometry-1_dev/xhtml1/chapter-6.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1/chapter-6.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>Geometry Interfaces Module Level 1 CR Test Suite</h1>
-  <h2>The DOMMatrix interfaces (1 tests)</h2>
+  <h2>The DOMMatrix interfaces (2 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -150,7 +150,15 @@
       <!-- 0 tests -->
     </tbody>
     <tbody id="s6.#dom-dommatrixreadonly">
-      <!-- 0 tests -->
+      <!-- 1 tests -->
+      <tr id="dommatrix-002-6.#dom-dommatrixreadonly" class="primary script">
+        <td><strong>
+            <a href="DOMMatrix-002.xht">dommatrix-002</a></strong></td>
+        <td></td>
+        <td><abbr class="script" title="Executes tests in script">Script</abbr></td>
+        <td>Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object
+        </td>
+      </tr>
     </tbody>
     <tbody id="s6.#dom-dommatrixreadonly-dommatrixreadonly-numbersequence">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1/toc.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1/toc.xht
index 7b01fb9cff3..c9aed6e0e67 100644
--- a/tests/wpt/css-tests/geometry-1_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1/toc.xht
@@ -47,7 +47,7 @@
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
         The DOMMatrix interfaces</a></th>
-      <td>(1 Tests)</td></tr>
+      <td>(2 Tests)</td></tr>
     </tbody>
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-001.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-001.xht
index 705fe98546f..8511ff2ff57 100644
--- a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-001.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-001.xht
@@ -25,8 +25,8 @@
             m12: 0, m22: 2, m32: 0, m42: 10,
             m13: 0, m23: 0, m33: 1, m43: 0,
             m14: 0, m24: 0, m34: 0, m44: 1,
-            is2D: true,
-            isIdentity: true
+            is2D: false,
+            isIdentity: false
         };
 
         test(function() {
@@ -41,7 +41,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0);
-            checkDOMMatrix(new DOMMatrix(float32Array), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(float32Array), scaleTranslate2D, false);
         },'testConstructor2');
         test(function() {
             var float32Array = new Float32Array(2.0, 0.0, 0.0, 2.0, 10.0, 10.0);
@@ -53,7 +53,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0]);
-            checkDOMMatrix(new DOMMatrix(float64Array), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(float64Array), scaleTranslate2D, false);
         },'testConstructor4');
         test(function() {
             var float64Array = new Float64Array(2.0, 0.0, 0.0, 2.0, 10.0, 10.0);
@@ -65,7 +65,7 @@
                 0.0, 2.0, 0.0, 0.0,
                 0.0, 0.0, 1.0, 0.0,
                 10.0, 10.0, 0.0, 1.0];
-            checkDOMMatrix(new DOMMatrix(sequence), scaleTranslate2D);
+            checkDOMMatrix(new DOMMatrix(sequence), scaleTranslate2D, false);
         },'testConstructor6');
         test(function() {
             var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0, 10.0];
@@ -134,11 +134,14 @@
             assert_throws(new TypeError(), function() { new DOMMatrixReadOnly(string); });
         },'testConstructorIllegal1');
         test(function() {
-            var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0, 10.0];
+            var sequence = [ 2.0, 0.0, 0.0, 2.0, 10.0];
             assert_throws(new TypeError(), function() { new DOMMatrixReadOnly(sequence); });
         },'testConstructorIllegal2');
 
-        function checkDOMMatrix(m, exp) {
+        function checkDOMMatrix(m, exp, is2D) {
+            if (is2D === undefined) {
+              is2D = exp.is2D;
+            }
             assert_equals(m.m11, exp.m11, "Expected value for m11 is " + exp.m11);
             assert_equals(m.m12, exp.m12, "Expected value for m12 is " + exp.m12);
             assert_equals(m.m13, exp.m13, "Expected value for m13 is " + exp.m13);
@@ -155,7 +158,7 @@
             assert_equals(m.m42, exp.m42, "Expected value for m42 is " + exp.m42);
             assert_equals(m.m43, exp.m43, "Expected value for m43 is " + exp.m43);
             assert_equals(m.m44, exp.m44, "Expected value for m44 is " + exp.m44);
-            assert_equals(m.is2D, exp.is2D, "Expected value for is2D is " + exp.is2D);
+            assert_equals(m.is2D, is2D, "Expected value for is2D is " + is2D);
             assert_equals(m.isIdentity, exp.isIdentity, "Expected value for isIdentity is " + exp.isIdentity);
         }
 
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-002.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-002.xht
new file mode 100644
index 00000000000..ebb5cb35679
--- /dev/null
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/DOMMatrix-002.xht
@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+    <title>Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object</title>
+    <link href="mailto:peter.hall@algomi.com" rel="author" title="Peter Hall" />
+    <link href="https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly" rel="help" />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+    <p>Test DOMMatrixReadOnly methods do not mutate the object</p>
+    <div id="log"></div>
+    <script>
+
+        function initialMatrix(){
+          return DOMMatrixReadOnly.fromMatrix(
+            {
+              m11:1,   m12:-0.5, m13: 0.5,  m14:0,
+              m21:0.5, m22:2,    m23: -0.5, m24:0,
+              m31:0,   m32:0,    m33: 1,    m34:0,
+              m41:0,   m42:0,    m43: 0,    m44:1,
+              is2D: false
+            }
+          );
+        }
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.translate(1,5,3);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test translate() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.scale(1,5,3,0,1,3);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test scale() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.scale3d(3,2,1,1);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test scale3d() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotate(Math.PI, Math.PI/2, Math.PI/6);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotate() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotateFromVector(10,-4);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotateFromVector() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.rotateAxisAngle(3,4,5, Math.PI/6);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test rotateAxisAngle() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.skewX(20);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test skewX() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.skewY(20);
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test skewY() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.multiply({ m11:1, m12:2, m13: 0, m14:0,
+                            m21:-1, m22:2, m23: -1, m24:0,
+                            m31:0, m32:0, m33: 1, m34:0,
+                            m41:5, m42:0, m43: 2, m44:1,
+                            is2D: false,
+                            isIdentity:false });
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test multiply() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.flipX();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test flipX() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.flipY();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test flipY() doesn't mutate");
+
+        test(function() {
+          var matrix = initialMatrix();
+          matrix.inverse();
+          checkDOMMatrix(matrix, initialMatrix());
+        },"test inverse() doesn't mutate");
+
+        function checkDOMMatrix(m, exp) {
+            assert_equals(m.m11, exp.m11, "Expected value for m11 is " + exp.m11);
+            assert_equals(m.m12, exp.m12, "Expected value for m12 is " + exp.m12);
+            assert_equals(m.m13, exp.m13, "Expected value for m13 is " + exp.m13);
+            assert_equals(m.m14, exp.m14, "Expected value for m14 is " + exp.m14);
+            assert_equals(m.m21, exp.m21, "Expected value for m21 is " + exp.m21);
+            assert_equals(m.m22, exp.m22, "Expected value for m22 is " + exp.m22);
+            assert_equals(m.m23, exp.m23, "Expected value for m23 is " + exp.m23);
+            assert_equals(m.m24, exp.m24, "Expected value for m24 is " + exp.m24);
+            assert_equals(m.m31, exp.m31, "Expected value for m31 is " + exp.m31);
+            assert_equals(m.m32, exp.m32, "Expected value for m32 is " + exp.m32);
+            assert_equals(m.m33, exp.m33, "Expected value for m33 is " + exp.m33);
+            assert_equals(m.m34, exp.m34, "Expected value for m34 is " + exp.m34);
+            assert_equals(m.m41, exp.m41, "Expected value for m41 is " + exp.m41);
+            assert_equals(m.m42, exp.m42, "Expected value for m42 is " + exp.m42);
+            assert_equals(m.m43, exp.m43, "Expected value for m43 is " + exp.m43);
+            assert_equals(m.m44, exp.m44, "Expected value for m44 is " + exp.m44);
+            assert_equals(m.is2D, exp.is2D, "Expected value for is2D is " + exp.is2D);
+            assert_equals(m.isIdentity, exp.isIdentity, "Expected value for isIdentity is " + exp.isIdentity);
+        }
+    </script>
+
+
+</body></html>
\ No newline at end of file
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/chapter-6.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/chapter-6.xht
index 5a470f78a80..f2b62605bda 100644
--- a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/chapter-6.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/chapter-6.xht
@@ -13,7 +13,7 @@
  <body>
 
   <h1>Geometry Interfaces Module Level 1 CR Test Suite</h1>
-  <h2>The DOMMatrix interfaces (1 tests)</h2>
+  <h2>The DOMMatrix interfaces (2 tests)</h2>
   <table width="100%">
     <col id="test-column"></col>
     <col id="refs-column"></col>
@@ -150,7 +150,15 @@
       <!-- 0 tests -->
     </tbody>
     <tbody id="s6.#dom-dommatrixreadonly">
-      <!-- 0 tests -->
+      <!-- 1 tests -->
+      <tr id="dommatrix-002-6.#dom-dommatrixreadonly" class="primary script">
+        <td><strong>
+            <a href="DOMMatrix-002.xht">dommatrix-002</a></strong></td>
+        <td></td>
+        <td><abbr class="script" title="Executes tests in script">Script</abbr></td>
+        <td>Geometry Interfaces: DOMMatrixReadOnly methods do not mutate the object
+        </td>
+      </tr>
     </tbody>
     <tbody id="s6.#dom-dommatrixreadonly-dommatrixreadonly-numbersequence">
       <!-- 0 tests -->
diff --git a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/toc.xht b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/toc.xht
index 7b01fb9cff3..c9aed6e0e67 100644
--- a/tests/wpt/css-tests/geometry-1_dev/xhtml1print/toc.xht
+++ b/tests/wpt/css-tests/geometry-1_dev/xhtml1print/toc.xht
@@ -47,7 +47,7 @@
     <tbody id="s6">
       <tr><th><a href="chapter-6.xht">Chapter 6 - 
         The DOMMatrix interfaces</a></th>
-      <td>(1 Tests)</td></tr>
+      <td>(2 Tests)</td></tr>
     </tbody>
     <tbody id="s7">
       <tr><th><a href="chapter-7.xht">Chapter 7 - 
diff --git a/tests/wpt/css-tests/source_rev b/tests/wpt/css-tests/source_rev
index 2c29e726b98..49f02f52860 100644
--- a/tests/wpt/css-tests/source_rev
+++ b/tests/wpt/css-tests/source_rev
@@ -1 +1 @@
-92d3ff28e536051929fc864ef322298d25aed153
\ No newline at end of file
+e6d9542971f19f189c0de096424d0681dea29bfa
\ No newline at end of file
diff --git a/tests/wpt/metadata-css/MANIFEST.json b/tests/wpt/metadata-css/MANIFEST.json
index 6840bafb39d..1fb91eb5945 100644
--- a/tests/wpt/metadata-css/MANIFEST.json
+++ b/tests/wpt/metadata-css/MANIFEST.json
@@ -8985,6 +8985,16 @@
         ],
         "url": "/css-color-3_dev/html4/t31-color-currentColor-b.htm"
       },
+      {
+        "path": "css-color-3_dev/html4/t31-color-text-a.htm",
+        "references": [
+          [
+            "/css-color-3_dev/html4/reference/t31-color-text-a-ref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css-color-3_dev/html4/t31-color-text-a.htm"
+      },
       {
         "path": "css-color-3_dev/html4/t32-opacity-offscreen-multiple-boxes-1-c.htm",
         "references": [
@@ -9455,6 +9465,16 @@
         ],
         "url": "/css-color-3_dev/xhtml1/t31-color-currentColor-b.xht"
       },
+      {
+        "path": "css-color-3_dev/xhtml1/t31-color-text-a.xht",
+        "references": [
+          [
+            "/css-color-3_dev/xhtml1/reference/t31-color-text-a-ref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css-color-3_dev/xhtml1/t31-color-text-a.xht"
+      },
       {
         "path": "css-color-3_dev/xhtml1/t32-opacity-offscreen-multiple-boxes-1-c.xht",
         "references": [
@@ -9875,6 +9895,16 @@
         ],
         "url": "/css-color-3_dev/xhtml1print/t31-color-currentColor-b.xht"
       },
+      {
+        "path": "css-color-3_dev/xhtml1print/t31-color-text-a.xht",
+        "references": [
+          [
+            "/css-color-3_dev/xhtml1print/reference/t31-color-text-a-ref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css-color-3_dev/xhtml1print/t31-color-text-a.xht"
+      },
       {
         "path": "css-color-3_dev/xhtml1print/t32-opacity-offscreen-multiple-boxes-1-c.xht",
         "references": [
@@ -174405,6 +174435,16 @@
         ],
         "url": "/css21_dev/html4/class-selector-007.htm"
       },
+      {
+        "path": "css21_dev/html4/class-selector-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/class-selector-008.htm"
+      },
       {
         "path": "css21_dev/html4/clear-001.htm",
         "references": [
@@ -184255,6 +184295,16 @@
         ],
         "url": "/css21_dev/html4/first-line-pseudo-016.htm"
       },
+      {
+        "path": "css21_dev/html4/first-line-pseudo-018.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/first-line-pseudo-018.htm"
+      },
       {
         "path": "css21_dev/html4/first-line-selector-013.htm",
         "references": [
@@ -242161,6 +242211,16 @@
         ],
         "url": "/css21_dev/xhtml1/class-selector-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/class-selector-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/class-selector-008.xht"
+      },
       {
         "path": "css21_dev/xhtml1/clear-001.xht",
         "references": [
@@ -251861,6 +251921,16 @@
         ],
         "url": "/css21_dev/xhtml1/first-line-pseudo-016.xht"
       },
+      {
+        "path": "css21_dev/xhtml1/first-line-pseudo-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/first-line-pseudo-018.xht"
+      },
       {
         "path": "css21_dev/xhtml1/first-line-selector-013.xht",
         "references": [
@@ -309457,6 +309527,16 @@
         ],
         "url": "/css21_dev/xhtml1print/class-selector-007.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/class-selector-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/class-selector-008.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/clear-001.xht",
         "references": [
@@ -319157,6 +319237,16 @@
         ],
         "url": "/css21_dev/xhtml1print/first-line-pseudo-016.xht"
       },
+      {
+        "path": "css21_dev/xhtml1print/first-line-pseudo-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/first-line-pseudo-018.xht"
+      },
       {
         "path": "css21_dev/xhtml1print/first-line-selector-013.xht",
         "references": [
@@ -357734,6 +357824,10 @@
         "path": "geometry-1_dev/html/DOMMatrix-001.htm",
         "url": "/geometry-1_dev/html/DOMMatrix-001.htm"
       },
+      {
+        "path": "geometry-1_dev/html/DOMMatrix-002.htm",
+        "url": "/geometry-1_dev/html/DOMMatrix-002.htm"
+      },
       {
         "path": "geometry-1_dev/html/DOMPoint-001.htm",
         "url": "/geometry-1_dev/html/DOMPoint-001.htm"
@@ -357750,6 +357844,10 @@
         "path": "geometry-1_dev/xhtml1/DOMMatrix-001.xht",
         "url": "/geometry-1_dev/xhtml1/DOMMatrix-001.xht"
       },
+      {
+        "path": "geometry-1_dev/xhtml1/DOMMatrix-002.xht",
+        "url": "/geometry-1_dev/xhtml1/DOMMatrix-002.xht"
+      },
       {
         "path": "geometry-1_dev/xhtml1/DOMPoint-001.xht",
         "url": "/geometry-1_dev/xhtml1/DOMPoint-001.xht"
@@ -357766,6 +357864,10 @@
         "path": "geometry-1_dev/xhtml1print/DOMMatrix-001.xht",
         "url": "/geometry-1_dev/xhtml1print/DOMMatrix-001.xht"
       },
+      {
+        "path": "geometry-1_dev/xhtml1print/DOMMatrix-002.xht",
+        "url": "/geometry-1_dev/xhtml1print/DOMMatrix-002.xht"
+      },
       {
         "path": "geometry-1_dev/xhtml1print/DOMPoint-001.xht",
         "url": "/geometry-1_dev/xhtml1print/DOMPoint-001.xht"
@@ -368981,6 +369083,18 @@
         "url": "/css-color-3_dev/html4/t31-color-currentColor-b.htm"
       }
     ],
+    "css-color-3_dev/html4/t31-color-text-a.htm": [
+      {
+        "path": "css-color-3_dev/html4/t31-color-text-a.htm",
+        "references": [
+          [
+            "/css-color-3_dev/html4/reference/t31-color-text-a-ref.htm",
+            "!="
+          ]
+        ],
+        "url": "/css-color-3_dev/html4/t31-color-text-a.htm"
+      }
+    ],
     "css-color-3_dev/html4/t32-opacity-offscreen-multiple-boxes-1-c.htm": [
       {
         "path": "css-color-3_dev/html4/t32-opacity-offscreen-multiple-boxes-1-c.htm",
@@ -369545,6 +369659,18 @@
         "url": "/css-color-3_dev/xhtml1/t31-color-currentColor-b.xht"
       }
     ],
+    "css-color-3_dev/xhtml1/t31-color-text-a.xht": [
+      {
+        "path": "css-color-3_dev/xhtml1/t31-color-text-a.xht",
+        "references": [
+          [
+            "/css-color-3_dev/xhtml1/reference/t31-color-text-a-ref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css-color-3_dev/xhtml1/t31-color-text-a.xht"
+      }
+    ],
     "css-color-3_dev/xhtml1/t32-opacity-offscreen-multiple-boxes-1-c.xht": [
       {
         "path": "css-color-3_dev/xhtml1/t32-opacity-offscreen-multiple-boxes-1-c.xht",
@@ -370049,6 +370175,18 @@
         "url": "/css-color-3_dev/xhtml1print/t31-color-currentColor-b.xht"
       }
     ],
+    "css-color-3_dev/xhtml1print/t31-color-text-a.xht": [
+      {
+        "path": "css-color-3_dev/xhtml1print/t31-color-text-a.xht",
+        "references": [
+          [
+            "/css-color-3_dev/xhtml1print/reference/t31-color-text-a-ref.xht",
+            "!="
+          ]
+        ],
+        "url": "/css-color-3_dev/xhtml1print/t31-color-text-a.xht"
+      }
+    ],
     "css-color-3_dev/xhtml1print/t32-opacity-offscreen-multiple-boxes-1-c.xht": [
       {
         "path": "css-color-3_dev/xhtml1print/t32-opacity-offscreen-multiple-boxes-1-c.xht",
@@ -567269,6 +567407,18 @@
         "url": "/css21_dev/html4/class-selector-007.htm"
       }
     ],
+    "css21_dev/html4/class-selector-008.htm": [
+      {
+        "path": "css21_dev/html4/class-selector-008.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/class-selector-008.htm"
+      }
+    ],
     "css21_dev/html4/clear-001.htm": [
       {
         "path": "css21_dev/html4/clear-001.htm",
@@ -579089,6 +579239,18 @@
         "url": "/css21_dev/html4/first-line-pseudo-016.htm"
       }
     ],
+    "css21_dev/html4/first-line-pseudo-018.htm": [
+      {
+        "path": "css21_dev/html4/first-line-pseudo-018.htm",
+        "references": [
+          [
+            "/css21_dev/html4/reference/ref-this-text-should-be-green.htm",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/html4/first-line-pseudo-018.htm"
+      }
+    ],
     "css21_dev/html4/first-line-selector-013.htm": [
       {
         "path": "css21_dev/html4/first-line-selector-013.htm",
@@ -648873,6 +649035,18 @@
         "url": "/css21_dev/xhtml1/class-selector-007.xht"
       }
     ],
+    "css21_dev/xhtml1/class-selector-008.xht": [
+      {
+        "path": "css21_dev/xhtml1/class-selector-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/class-selector-008.xht"
+      }
+    ],
     "css21_dev/xhtml1/clear-001.xht": [
       {
         "path": "css21_dev/xhtml1/clear-001.xht",
@@ -660513,6 +660687,18 @@
         "url": "/css21_dev/xhtml1/first-line-pseudo-016.xht"
       }
     ],
+    "css21_dev/xhtml1/first-line-pseudo-018.xht": [
+      {
+        "path": "css21_dev/xhtml1/first-line-pseudo-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1/first-line-pseudo-018.xht"
+      }
+    ],
     "css21_dev/xhtml1/first-line-selector-013.xht": [
       {
         "path": "css21_dev/xhtml1/first-line-selector-013.xht",
@@ -729925,6 +730111,18 @@
         "url": "/css21_dev/xhtml1print/class-selector-007.xht"
       }
     ],
+    "css21_dev/xhtml1print/class-selector-008.xht": [
+      {
+        "path": "css21_dev/xhtml1print/class-selector-008.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/class-selector-008.xht"
+      }
+    ],
     "css21_dev/xhtml1print/clear-001.xht": [
       {
         "path": "css21_dev/xhtml1print/clear-001.xht",
@@ -741565,6 +741763,18 @@
         "url": "/css21_dev/xhtml1print/first-line-pseudo-016.xht"
       }
     ],
+    "css21_dev/xhtml1print/first-line-pseudo-018.xht": [
+      {
+        "path": "css21_dev/xhtml1print/first-line-pseudo-018.xht",
+        "references": [
+          [
+            "/css21_dev/xhtml1print/reference/ref-this-text-should-be-green.xht",
+            "=="
+          ]
+        ],
+        "url": "/css21_dev/xhtml1print/first-line-pseudo-018.xht"
+      }
+    ],
     "css21_dev/xhtml1print/first-line-selector-013.xht": [
       {
         "path": "css21_dev/xhtml1print/first-line-selector-013.xht",
@@ -781494,7 +781704,7 @@
       }
     ]
   },
-  "rev": "7d0ff6117ee51720c307ea24d413d13eb5abf3e6",
+  "rev": "5366390418de396cdf7c9d45fbaedbed81dc4a61",
   "url_base": "/",
   "version": 2
 }
diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-018.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-018.htm.ini
new file mode 100644
index 00000000000..7e5e4afad0b
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-018.htm.ini
@@ -0,0 +1,3 @@
+[first-line-pseudo-018.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/geometry-1_dev/html/DOMMatrix-002.htm.ini b/tests/wpt/metadata-css/geometry-1_dev/html/DOMMatrix-002.htm.ini
new file mode 100644
index 00000000000..c3815bb6619
--- /dev/null
+++ b/tests/wpt/metadata-css/geometry-1_dev/html/DOMMatrix-002.htm.ini
@@ -0,0 +1,38 @@
+[DOMMatrix-002.htm]
+  type: testharness
+  [test translate() doesn't mutate]
+    expected: FAIL
+
+  [test scale() doesn't mutate]
+    expected: FAIL
+
+  [test scale3d() doesn't mutate]
+    expected: FAIL
+
+  [test rotate() doesn't mutate]
+    expected: FAIL
+
+  [test rotateFromVector() doesn't mutate]
+    expected: FAIL
+
+  [test rotateAxisAngle() doesn't mutate]
+    expected: FAIL
+
+  [test skewX() doesn't mutate]
+    expected: FAIL
+
+  [test skewY() doesn't mutate]
+    expected: FAIL
+
+  [test multiply() doesn't mutate]
+    expected: FAIL
+
+  [test flipX() doesn't mutate]
+    expected: FAIL
+
+  [test flipY() doesn't mutate]
+    expected: FAIL
+
+  [test inverse() doesn't mutate]
+    expected: FAIL
+

+ - 7.1.1 Common Values of flex
- autoheight-regions-in-autoheight-flexbox-003	=	Ahem	CSS Regions: auto-height regions in auto-height flexbox with flex basis - - Test checks that the computed height of auto-height regions placed in a flex container takes into the account the flex basis property. The space available inside the flex container should be distributed according to the flex basis property. In this particular case, each of the three regions must have a height equal to one third of the flex container's height. - -
@@ -1356,12 +1351,6 @@