Update CSS tests to revision 4e1aa4f3dcbff1abd654c63d0f677379c1e2775f

author: Ms2ger <Ms2ger@gmail.com> 2015-11-30 10:16:54 +0100
committer: Ms2ger <Ms2ger@gmail.com> 2015-11-30 12:21:03 +0100
commit: 6bb495338bc5dd2ce4e66ca5e0e69b0016319f07 (patch)
tree: 685503020cda0c53793faee76351755c228876e3 /tests/wpt/css-tests/css-grid-1_dev
parent: 0f7204936394fe104431f01c68ffa17829426cba (diff)
download: servo-6bb495338bc5dd2ce4e66ca5e0e69b0016319f07.tar.gz
servo-6bb495338bc5dd2ce4e66ca5e0e69b0016319f07.zip
62 files changed, 537 insertions, 507 deletions
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/chapter-4.htm b/tests/wpt/css-tests/css-grid-1_dev/html/chapter-4.htm
index 934dd09b3cc..e88c1deb6d8 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/chapter-4.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/chapter-4.htm
@@ -508,102 +508,102 @@
         <a href="#s4.4">+</a>
         <a href="http://www.w3.org/TR/css-grid-1/#min-size-auto">4.4 Implied Minimum Size of Grid Items</a></th></tr>
       <!-- 9 tests -->
-      <tr id="grid-minimun-size-grid-items-001-4.4" class="primary ahem">
+      <tr id="grid-minimum-size-grid-items-001-4.4" class="primary ahem">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-001.htm">grid-minimun-size-grid-items-001</a></strong></td>
+            <a href="grid-minimum-size-grid-items-001.htm">grid-minimum-size-grid-items-001</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-002-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-002-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-002.htm">grid-minimun-size-grid-items-002</a></strong></td>
+            <a href="grid-minimum-size-grid-items-002.htm">grid-minimum-size-grid-items-002</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-003-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-003-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-003.htm">grid-minimun-size-grid-items-003</a></strong></td>
+            <a href="grid-minimum-size-grid-items-003.htm">grid-minimum-size-grid-items-003</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li>
+            <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-004-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-004-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-004.htm">grid-minimun-size-grid-items-004</a></strong></td>
+            <a href="grid-minimum-size-grid-items-004.htm">grid-minimum-size-grid-items-004</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li>
+            <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-005-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-005-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-005.htm">grid-minimun-size-grid-items-005</a></strong></td>
+            <a href="grid-minimum-size-grid-items-005.htm">grid-minimum-size-grid-items-005</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-006-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-006-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-006.htm">grid-minimun-size-grid-items-006</a></strong></td>
+            <a href="grid-minimum-size-grid-items-006.htm">grid-minimum-size-grid-items-006</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-007-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-007-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-007.htm">grid-minimun-size-grid-items-007</a></strong></td>
+            <a href="grid-minimum-size-grid-items-007.htm">grid-minimum-size-grid-items-007</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-008-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-008-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-008.htm">grid-minimun-size-grid-items-008</a></strong></td>
+            <a href="grid-minimum-size-grid-items-008.htm">grid-minimum-size-grid-items-008</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-009-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-009-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-009.htm">grid-minimun-size-grid-items-009</a></strong></td>
+            <a href="grid-minimum-size-grid-items-009.htm">grid-minimum-size-grid-items-009</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-001.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-001.htm
index c57c1ed46d0..f370aa5edc7 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-001.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-001.htm
@@ -20,7 +20,6 @@
                 display: inline-grid;
                 font: 25px/1 Ahem;
                 color: green;
-                grid-template-columns: auto auto;
             }
         </style>
     </head>
@@ -33,9 +32,7 @@
             em
             <div>it</div>
             em
-        </div>
-        <br>
-        <div class="test-inline-grid-overlapping-green">
+        </div><div class="test-inline-grid-overlapping-green">
             it
             <span>em</span>
             it
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-002.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-002.htm
index 029a57f06e0..8229de57730 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-002.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-items-002.htm
@@ -21,17 +21,13 @@
                 font: 25px/1 Ahem;
                 color: green;
             }
-
-            .two-columns {
-                grid-template-columns: auto auto;
-            }
         </style>
     </head>
     <body>
         <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
         <div id="reference-overlapped-red"></div>
-        <div class="test-inline-grid-overlapping-green two-columns">
+        <div class="test-inline-grid-overlapping-green">
             <div>
                 <div>it</div>
                 em
@@ -40,14 +36,18 @@
                 it
                 <div>em</div>
             </div>
-        </div>
-        <br>
-        <div class="test-inline-grid-overlapping-green">
+        </div><div class="test-inline-grid-overlapping-green">
+            <span>
+                <span>i</span>t
+            </span>
+            <span>
+                e<span>m</span>
+            </span>
             <span>
-                <span>it</span>em
+                <span>i</span>t
             </span>
             <span>
-                it<span>em</span>
+                e<span>m</span>
             </span>
         </div>
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-flexible-lengths-001.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-flexible-lengths-001.htm
index 09e2e9f525e..4db3fb56491 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-flexible-lengths-001.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-flexible-lengths-001.htm
@@ -34,10 +34,10 @@
             TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px");
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-grid-template-areas-001.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-grid-template-areas-001.htm
index 220f8228426..fa36b904a41 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-grid-template-areas-001.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-inline-support-grid-template-areas-001.htm
@@ -28,29 +28,29 @@
             TestingUtils.testGridTemplateAreas('inline-grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"', '"a b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "c d"', '"a b" "c d"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"a     b"     "c     d"', '"a b" "c d"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"a     b"     "c     d"', ['"a b" "c d"', '"a     b" "c     d"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b""c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\t"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\n"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "a b"', '"a b" "a b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a a" "b b"', '"a a" "b b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". a ." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', '". a ." "b a c"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']);
             TestingUtils.testGridTemplateAreas('inline-grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". a" "b a" ". a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', '". a" "b a" ". a"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"a a a" "b b b"', '"a a a" "b b b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". ." "a a"', '". ." "a a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', '". ." "a a"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']);
 
             // Reset values.
             document.getElementById('inline-grid').style.gridTemplateAreas = '';
@@ -69,7 +69,7 @@
             TestingUtils.testGridTemplateAreas('inline-grid', '"b a" "b b"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "b a"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a ." ". a"', 'none');
-            TestingUtils.testGridTemplateAreas('inline-grid', '","', '","');
+            TestingUtils.testGridTemplateAreas('inline-grid', '","', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"10%"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"USD$"', 'none');
         </script>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-001.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-001.htm
index f6fd2b6691f..3de4a2c538f 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-001.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-001.htm
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
         <meta name="flags" content="ahem">
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size.">
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-002.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-002.htm
index 1992edf5fd1..ba9dcc5c503 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-002.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-002.htm
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size.">
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-003.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-003.htm
index 222da1768f8..d83806b4958 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-003.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-003.htm
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size.">
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-004.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-004.htm
index a017dced66d..e43be13e5de 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-004.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-004.htm
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size.">
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-005.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-005.htm
index 87a87696ede..422acc8b9bf 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-005.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-005.htm
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size.">
+        <meta name="flags" content="image">
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
@@ -26,7 +27,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img src="../support/100x100-green.png">
+            <img src="support/100x100-green.png" alt="Image download support must be enabled">
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-007.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-006.htm
index b17471fa4ab..51e2262382f 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-007.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-006.htm
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.">
+        <meta name="flags" content="image">
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png">
+            <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled">
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-006.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-007.htm
index 0eed1e15492..2866c352229 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-006.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-007.htm
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.">
+        <meta name="flags" content="image">
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png">
+            <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled">
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-009.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-008.htm
index d0cd92bb404..18a71a3d8f1 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-009.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-008.htm
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.">
+        <meta name="flags" content="image">
+        <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png">
+            <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled">
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-008.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-009.htm
index 9a6d6c75213..6c7ea417392 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimun-size-grid-items-008.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-minimum-size-grid-items-009.htm
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items">
         <link rel="match" href="reference/ref-filled-green-100px-square.htm">
-        <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.">
+        <meta name="flags" content="image">
+        <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.">
         <style type="text/css">
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png">
+            <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled">
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-flexible-lengths-001.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-flexible-lengths-001.htm
index 944422877ea..0f84b2bdaeb 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-flexible-lengths-001.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-flexible-lengths-001.htm
@@ -34,10 +34,10 @@
             TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px");
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-grid-template-areas-001.htm b/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-grid-template-areas-001.htm
index 843b11abafa..852ad4560d5 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-grid-template-areas-001.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/grid-support-grid-template-areas-001.htm
@@ -28,29 +28,29 @@
             TestingUtils.testGridTemplateAreas('grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"', '"a b"');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "c d"', '"a b" "c d"');
-            TestingUtils.testGridTemplateAreas('grid', '"a     b"     "c     d"', '"a b" "c d"');
+            TestingUtils.testGridTemplateAreas('grid', '"a     b"     "c     d"', ['"a b" "c d"', '"a     b" "c     d"']);
             TestingUtils.testGridTemplateAreas('grid', '"a b""c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"\t"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"\n"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "a b"', '"a b" "a b"');
             TestingUtils.testGridTemplateAreas('grid', '"a a" "b b"', '"a a" "b b"');
             TestingUtils.testGridTemplateAreas('grid', '". a ." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', '". a ." "b a c"');
+            TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']);
+            TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']);
             TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."');
+            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']);
+            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']);
             TestingUtils.testGridTemplateAreas('grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."');
+            TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']);
+            TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']);
             TestingUtils.testGridTemplateAreas('grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"');
             TestingUtils.testGridTemplateAreas('grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"');
             TestingUtils.testGridTemplateAreas('grid', '". a" "b a" ". a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', '". a" "b a" ". a"');
+            TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']);
+            TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']);
             TestingUtils.testGridTemplateAreas('grid', '"a a a" "b b b"', '"a a a" "b b b"');
             TestingUtils.testGridTemplateAreas('grid', '". ." "a a"', '". ." "a a"');
-            TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', '". ." "a a"');
+            TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']);
 
             // Reset values.
             document.getElementById('grid').style.gridTemplateAreas = '';
@@ -69,7 +69,7 @@
             TestingUtils.testGridTemplateAreas('grid', '"b a" "b b"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "b a"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"a ." ". a"', 'none');
-            TestingUtils.testGridTemplateAreas('grid', '","', '","');
+            TestingUtils.testGridTemplateAreas('grid', '","', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"10%"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"USD$"', 'none');
         </script>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/reference/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/html/reference/support/testing-utils.js
index c4ceec3a805..202c865b15e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/reference/support/testing-utils.js
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/reference/support/testing-utils.js
@@ -18,11 +18,15 @@ var TestingUtils = (function() {
         }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle  + "; and grid-template-rows: " + rowsStyle + ";");
     }
 
+    function checkGridTemplateAreas(element, value) {
+        assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas");
+    }
+
     function testGridTemplateAreas(gridId, style, value) {
         test(function() {
             var grid = document.getElementById(gridId);
             grid.style.gridTemplateAreas = style;
-            assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas");
+            checkGridTemplateAreas(grid, value);
         }, "'" + gridId + "' with: grid-template-areas: " + style + ";");
     }
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-grid-1_dev/html/reftest-toc.htm
index 3fedc00883d..18f3571f59d 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/reftest-toc.htm
@@ -544,76 +544,76 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-001" class="ahem">
+    <tbody id="grid-minimum-size-grid-items-001" class="ahem">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-001.htm">grid-minimun-size-grid-items-001</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-001.htm">grid-minimum-size-grid-items-001</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-002" class="">
+    <tbody id="grid-minimum-size-grid-items-002" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-002.htm">grid-minimun-size-grid-items-002</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-002.htm">grid-minimum-size-grid-items-002</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-003" class="">
+    <tbody id="grid-minimum-size-grid-items-003" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-003.htm">grid-minimun-size-grid-items-003</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-003.htm">grid-minimum-size-grid-items-003</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-004" class="">
+    <tbody id="grid-minimum-size-grid-items-004" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-004.htm">grid-minimun-size-grid-items-004</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-004.htm">grid-minimum-size-grid-items-004</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-005" class="">
+    <tbody id="grid-minimum-size-grid-items-005" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-005.htm">grid-minimun-size-grid-items-005</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-005.htm">grid-minimum-size-grid-items-005</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-006" class="">
+    <tbody id="grid-minimum-size-grid-items-006" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-006.htm">grid-minimun-size-grid-items-006</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-006.htm">grid-minimum-size-grid-items-006</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-007" class="">
+    <tbody id="grid-minimum-size-grid-items-007" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-007.htm">grid-minimun-size-grid-items-007</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-007.htm">grid-minimum-size-grid-items-007</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-008" class="">
+    <tbody id="grid-minimum-size-grid-items-008" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-008.htm">grid-minimun-size-grid-items-008</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-008.htm">grid-minimum-size-grid-items-008</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-009" class="">
+    <tbody id="grid-minimum-size-grid-items-009" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-009.htm">grid-minimun-size-grid-items-009</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-009.htm">grid-minimum-size-grid-items-009</a></td>
         <td><a href="reference/ref-filled-green-100px-square.htm">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
     <tbody id="grid-multicol-001" class="">
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/reftest.list b/tests/wpt/css-tests/css-grid-1_dev/html/reftest.list
index 20f0c441a8c..55d2373dd18 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/reftest.list
@@ -64,15 +64,15 @@ grid-layout-repeat-notation.htm == reference/grid-layout-repeat-notation-ref.htm
 grid-layout-z-order-a.htm == reference/grid-layout-z-order-ref.htm
 grid-layout-z-order-b.htm == reference/grid-layout-z-order-ref.htm
 grid-margins-no-collapse-001.htm == reference/grid-text-green-margin-no-collapse-ref.htm
-grid-minimun-size-grid-items-001.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-002.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-003.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-004.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-005.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-006.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-007.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-008.htm == reference/ref-filled-green-100px-square.htm
-grid-minimun-size-grid-items-009.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-001.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-002.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-003.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-004.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-005.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-006.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-007.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-008.htm == reference/ref-filled-green-100px-square.htm
+grid-minimum-size-grid-items-009.htm == reference/ref-filled-green-100px-square.htm
 grid-multicol-001.htm == reference/ref-filled-green-100px-square.htm
 grid-order-property-auto-placement-001.htm == reference/grid-2x2-blue-yellow-lime-magenta.htm
 grid-order-property-auto-placement-002.htm == reference/grid-2x2-blue-yellow-lime-magenta.htm
diff --git a/tests/wpt/css-tests/css-grid-1_dev/html/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/html/support/testing-utils.js
index c4ceec3a805..202c865b15e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/html/support/testing-utils.js
+++ b/tests/wpt/css-tests/css-grid-1_dev/html/support/testing-utils.js
@@ -18,11 +18,15 @@ var TestingUtils = (function() {
         }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle  + "; and grid-template-rows: " + rowsStyle + ";");
     }
 
+    function checkGridTemplateAreas(element, value) {
+        assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas");
+    }
+
     function testGridTemplateAreas(gridId, style, value) {
         test(function() {
             var grid = document.getElementById(gridId);
             grid.style.gridTemplateAreas = style;
-            assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas");
+            checkGridTemplateAreas(grid, value);
         }, "'" + gridId + "' with: grid-template-areas: " + style + ";");
     }
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-grid-1_dev/implementation-report-TEMPLATE.data
index 2f8e34d5e55..04d3140b59c 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-grid-1_dev/implementation-report-TEMPLATE.data
@@ -49,10 +49,10 @@ html/grid-inline-float-001.htm	46b1d12be2ebe83b9d1f07d9bcd5c088a0db92dc	?
 xhtml1/grid-inline-float-001.xht	46b1d12be2ebe83b9d1f07d9bcd5c088a0db92dc	?
 html/grid-inline-floats-no-intrude-001.htm	023d2517d777699e4cb720aae6a5db2e6320f64a	?
 xhtml1/grid-inline-floats-no-intrude-001.xht	023d2517d777699e4cb720aae6a5db2e6320f64a	?
-html/grid-inline-items-001.htm	3b5405730e637d3ca49947fb78d495a0e782baf9	?
-xhtml1/grid-inline-items-001.xht	3b5405730e637d3ca49947fb78d495a0e782baf9	?
-html/grid-inline-items-002.htm	504a0adeb562210ab884f495087e085ab24c92d0	?
-xhtml1/grid-inline-items-002.xht	504a0adeb562210ab884f495087e085ab24c92d0	?
+html/grid-inline-items-001.htm	7e3b520c584fea0f45e4de1f26685c21e8d6200a	?
+xhtml1/grid-inline-items-001.xht	7e3b520c584fea0f45e4de1f26685c21e8d6200a	?
+html/grid-inline-items-002.htm	8f25a360fb08e7fdb55e2bc8998b4455f04fd182	?
+xhtml1/grid-inline-items-002.xht	8f25a360fb08e7fdb55e2bc8998b4455f04fd182	?
 html/grid-inline-items-003.htm	5f9d45d3f7cc135bfaea625317ac8c261354b63c	?
 xhtml1/grid-inline-items-003.xht	5f9d45d3f7cc135bfaea625317ac8c261354b63c	?
 html/grid-inline-items-inline-blocks-001.htm	e4ae7477d5c1838d4cb6b2cd3b3c0b671be3f795	?
@@ -81,10 +81,10 @@ html/grid-inline-order-property-painting-004.htm	93ea4f95eeb4e085c1bb4ea9e5d0fc4
 xhtml1/grid-inline-order-property-painting-004.xht	93ea4f95eeb4e085c1bb4ea9e5d0fc4fa1c64ac9	?
 html/grid-inline-order-property-painting-005.htm	72728e05989a070edb754801be2e9769ec861c2d	?
 xhtml1/grid-inline-order-property-painting-005.xht	72728e05989a070edb754801be2e9769ec861c2d	?
-html/grid-inline-support-flexible-lengths-001.htm	7a5d069f5a18a6a92f6546216824343a340f796f	?
-xhtml1/grid-inline-support-flexible-lengths-001.xht	7a5d069f5a18a6a92f6546216824343a340f796f	?
-html/grid-inline-support-grid-template-areas-001.htm	857bebb83eea2ec6f66dac66bf38dc3815bef4c2	?
-xhtml1/grid-inline-support-grid-template-areas-001.xht	857bebb83eea2ec6f66dac66bf38dc3815bef4c2	?
+html/grid-inline-support-flexible-lengths-001.htm	50df9e55bd1d12e8a82069ec2022df8cfb5f5bd9	?
+xhtml1/grid-inline-support-flexible-lengths-001.xht	50df9e55bd1d12e8a82069ec2022df8cfb5f5bd9	?
+html/grid-inline-support-grid-template-areas-001.htm	037e8d6035c98c445a7938c5a56f20f5ff430033	?
+xhtml1/grid-inline-support-grid-template-areas-001.xht	037e8d6035c98c445a7938c5a56f20f5ff430033	?
 html/grid-inline-support-grid-template-columns-rows-001.htm	236930bb2240e757225dc6b34a82ea0f15f2ec0e	?
 xhtml1/grid-inline-support-grid-template-columns-rows-001.xht	236930bb2240e757225dc6b34a82ea0f15f2ec0e	?
 html/grid-inline-support-named-grid-lines-001.htm	315365f9bccd7657245b347cef4ced75b257e302	?
@@ -149,24 +149,24 @@ html/grid-layout-z-order-b.htm	fc0d9c23d430075933e4db79ab3f8acf2fc8bf8a	?
 xhtml1/grid-layout-z-order-b.xht	fc0d9c23d430075933e4db79ab3f8acf2fc8bf8a	?
 html/grid-margins-no-collapse-001.htm	a2cc4e1ac516408da65ef363beef36c757736f6f	?
 xhtml1/grid-margins-no-collapse-001.xht	a2cc4e1ac516408da65ef363beef36c757736f6f	?
-html/grid-minimun-size-grid-items-001.htm	613e5e003415c0130450183380f315c9e03ad387	?
-xhtml1/grid-minimun-size-grid-items-001.xht	613e5e003415c0130450183380f315c9e03ad387	?
-html/grid-minimun-size-grid-items-002.htm	8ba15922ec30224f55a66300119ef091bcc61949	?
-xhtml1/grid-minimun-size-grid-items-002.xht	8ba15922ec30224f55a66300119ef091bcc61949	?
-html/grid-minimun-size-grid-items-003.htm	8466f7ed95e32d3d1a36e5c72a2132bfadf5476c	?
-xhtml1/grid-minimun-size-grid-items-003.xht	8466f7ed95e32d3d1a36e5c72a2132bfadf5476c	?
-html/grid-minimun-size-grid-items-004.htm	20fc5c365dd1bb26b195e4231a632436f866e522	?
-xhtml1/grid-minimun-size-grid-items-004.xht	20fc5c365dd1bb26b195e4231a632436f866e522	?
-html/grid-minimun-size-grid-items-005.htm	6d579b3cd3b1d2d1da0df2d851c506a8f6203d34	?
-xhtml1/grid-minimun-size-grid-items-005.xht	6d579b3cd3b1d2d1da0df2d851c506a8f6203d34	?
-html/grid-minimun-size-grid-items-006.htm	6aa026fabce74ae5bfbc3dcdd69b4b116b489179	?
-xhtml1/grid-minimun-size-grid-items-006.xht	6aa026fabce74ae5bfbc3dcdd69b4b116b489179	?
-html/grid-minimun-size-grid-items-007.htm	c2d40f75e22894e6651e1aa6e3a74f301e7d8fb0	?
-xhtml1/grid-minimun-size-grid-items-007.xht	c2d40f75e22894e6651e1aa6e3a74f301e7d8fb0	?
-html/grid-minimun-size-grid-items-008.htm	cc4f477db54018c7db8553726e9617dfe32a755f	?
-xhtml1/grid-minimun-size-grid-items-008.xht	cc4f477db54018c7db8553726e9617dfe32a755f	?
-html/grid-minimun-size-grid-items-009.htm	e4da8e15125cbf0af8a68c689bf7767c58926b57	?
-xhtml1/grid-minimun-size-grid-items-009.xht	e4da8e15125cbf0af8a68c689bf7767c58926b57	?
+html/grid-minimum-size-grid-items-001.htm	a69269399a2b148e6450ac037c938641e6b90c3e	?
+xhtml1/grid-minimum-size-grid-items-001.xht	a69269399a2b148e6450ac037c938641e6b90c3e	?
+html/grid-minimum-size-grid-items-002.htm	bd5a3c8c88c5056cbd82e3de5f555ddfda34f64c	?
+xhtml1/grid-minimum-size-grid-items-002.xht	bd5a3c8c88c5056cbd82e3de5f555ddfda34f64c	?
+html/grid-minimum-size-grid-items-003.htm	b6bde0186a33951cb313396ce8c278ceb38396eb	?
+xhtml1/grid-minimum-size-grid-items-003.xht	b6bde0186a33951cb313396ce8c278ceb38396eb	?
+html/grid-minimum-size-grid-items-004.htm	6aa3dcde25c815d919f566c18fe3b8b72dba7558	?
+xhtml1/grid-minimum-size-grid-items-004.xht	6aa3dcde25c815d919f566c18fe3b8b72dba7558	?
+html/grid-minimum-size-grid-items-005.htm	fd28bce2bd61ecd1b2ceff2bce2782331976a8d8	?
+xhtml1/grid-minimum-size-grid-items-005.xht	fd28bce2bd61ecd1b2ceff2bce2782331976a8d8	?
+html/grid-minimum-size-grid-items-006.htm	174e283c947342672b4f4f17ca17127e7bf31a38	?
+xhtml1/grid-minimum-size-grid-items-006.xht	174e283c947342672b4f4f17ca17127e7bf31a38	?
+html/grid-minimum-size-grid-items-007.htm	d588f01baf7d50455025a8977a82da55416567c7	?
+xhtml1/grid-minimum-size-grid-items-007.xht	d588f01baf7d50455025a8977a82da55416567c7	?
+html/grid-minimum-size-grid-items-008.htm	197f82d6f89561a846c9c2ba41e6b812246359b5	?
+xhtml1/grid-minimum-size-grid-items-008.xht	197f82d6f89561a846c9c2ba41e6b812246359b5	?
+html/grid-minimum-size-grid-items-009.htm	fa9da3bd4d0d78e885f4f55d1e0cca3f0ba5210d	?
+xhtml1/grid-minimum-size-grid-items-009.xht	fa9da3bd4d0d78e885f4f55d1e0cca3f0ba5210d	?
 html/grid-multicol-001.htm	521dbe45e2022be1140904fe6d2513370d6bfef3	?
 xhtml1/grid-multicol-001.xht	521dbe45e2022be1140904fe6d2513370d6bfef3	?
 html/grid-order-property-auto-placement-001.htm	ad5b4e57de7a4ea9fd826be7fca30d6700672fa1	?
@@ -191,10 +191,10 @@ html/grid-order-property-painting-005.htm	1816a5bb33c6984fa4cd4d0d834d8681391acb
 xhtml1/grid-order-property-painting-005.xht	1816a5bb33c6984fa4cd4d0d834d8681391acb9d	?
 html/grid-support-display-001.htm	18055d2ae743945500cc0444a2658411a0791120	?
 xhtml1/grid-support-display-001.xht	18055d2ae743945500cc0444a2658411a0791120	?
-html/grid-support-flexible-lengths-001.htm	e48ba1cdab5dee3a3f6a3f2201d8b1b69598b1f5	?
-xhtml1/grid-support-flexible-lengths-001.xht	e48ba1cdab5dee3a3f6a3f2201d8b1b69598b1f5	?
-html/grid-support-grid-template-areas-001.htm	dc6323f059179c2e6bdbcf23148b94695ffea11e	?
-xhtml1/grid-support-grid-template-areas-001.xht	dc6323f059179c2e6bdbcf23148b94695ffea11e	?
+html/grid-support-flexible-lengths-001.htm	d291ecbfb4665d4119d0737beaa4451b306b1b82	?
+xhtml1/grid-support-flexible-lengths-001.xht	d291ecbfb4665d4119d0737beaa4451b306b1b82	?
+html/grid-support-grid-template-areas-001.htm	ba4d646749df2afdba6897cfb6cbdf9402f15b6c	?
+xhtml1/grid-support-grid-template-areas-001.xht	ba4d646749df2afdba6897cfb6cbdf9402f15b6c	?
 html/grid-support-grid-template-columns-rows-001.htm	9a79b1fd5bc89c0b2dd0a0b38850a15096130f99	?
 xhtml1/grid-support-grid-template-columns-rows-001.xht	9a79b1fd5bc89c0b2dd0a0b38850a15096130f99	?
 html/grid-support-named-grid-lines-001.htm	7f20858fbf5e857df816ec4eeb5c63a65baefcf9	?
diff --git a/tests/wpt/css-tests/css-grid-1_dev/testinfo.data b/tests/wpt/css-tests/css-grid-1_dev/testinfo.data
index 52d03f129d1..8b974a81bf6 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-grid-1_dev/testinfo.data
@@ -22,8 +22,8 @@ grid-inline-first-line-002	reference/grid-text-green-margin-no-collapse-ref	'::f
 grid-inline-first-line-003	reference/grid-text-green-margin-no-collapse-ref	'::first-line' works on grid items within an inline grid		http://www.w3.org/TR/css-grid-1/#grid-containers,http://www.w3.org/TR/css3-selectors/#first-formatted-line	bd407ad32213f6b35ec5b75c7da8059004a2ad4f	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that '::first-line' pseudo-element works as expected if it is applied directly to a grid item within an inline grid.
 grid-inline-float-001	reference/ref-filled-green-100px-square	'float' has no effect on grid items within an inline grid		http://www.w3.org/TR/css-grid-1/#grid-containers,http://www.w3.org/TR/CSS21/visuren.html#float-position	46b1d12be2ebe83b9d1f07d9bcd5c088a0db92dc	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-inline-floats-no-intrude-001	reference/ref-filled-green-100px-square	floats do not intrude into an inline grid		http://www.w3.org/TR/css-grid-1/#grid-containers	023d2517d777699e4cb720aae6a5db2e6320f64a	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
-grid-inline-items-001	reference/ref-filled-green-100px-square	Regular and anonymous grid items within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#grid-items	3b5405730e637d3ca49947fb78d495a0e782baf9	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that inline grid container children become grid items, and text that is directly contained inside the inline grid is wrapped in an anonymous grid item.
-grid-inline-items-002	reference/ref-filled-green-100px-square	Children of grid items do not create new items within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#grid-items	504a0adeb562210ab884f495087e085ab24c92d0	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that the grid items do not split around blocks creating extra items within an inline grid.
+grid-inline-items-001	reference/ref-filled-green-100px-square	Regular and anonymous grid items within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#grid-items	7e3b520c584fea0f45e4de1f26685c21e8d6200a	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that inline grid container children become grid items, and text that is directly contained inside the inline grid is wrapped in an anonymous grid item.
+grid-inline-items-002	reference/ref-filled-green-100px-square	Children of grid items do not create new items within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#grid-items	8f25a360fb08e7fdb55e2bc8998b4455f04fd182	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that the grid items do not split around blocks creating extra items within an inline grid.
 grid-inline-items-003	reference/ref-filled-green-100px-square	Grid items with 'display:none' are not rendered within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#grid-items	5f9d45d3f7cc135bfaea625317ac8c261354b63c	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-inline-items-inline-blocks-001	reference/ref-filled-green-100px-square	Paint order of grid items within an inline grid is the same as inline blocks		http://www.w3.org/TR/css-grid-1/#z-order,http://www.w3.org/TR/CSS2/zindex.html#painting-order	e4ae7477d5c1838d4cb6b2cd3b3c0b671be3f795	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-inline-margins-no-collapse-001	reference/grid-text-green-margin-no-collapse-ref	inline grid's margins do not collapse		http://www.w3.org/TR/css-grid-1/#grid-containers	a192201faf7ef25b555ae48cc9e549a5454f2bad	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that inline grid's margin (body) do not collapse with the marings of the grid item (a paragraph).
@@ -38,8 +38,8 @@ grid-inline-order-property-painting-002	reference/ref-filled-green-100px-square
 grid-inline-order-property-painting-003	reference/ref-filled-green-100px-square	'order' property affects grid items painting order within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	03c0507a09b98f190b9fdf128000c6db32222537	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-inline-order-property-painting-004	reference/ref-filled-green-100px-square	'order' property affects grid items painting order within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	93ea4f95eeb4e085c1bb4ea9e5d0fc4fa1c64ac9	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-inline-order-property-painting-005	reference/ref-filled-green-100px-square	'order' property affects grid items painting order within an inline grid	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	72728e05989a070edb754801be2e9769ec861c2d	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
-grid-inline-support-flexible-lengths-001		Support flexible lengths for 'grid-template-columns' and 'grid-template-rows' properties within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#fr-unit	7a5d069f5a18a6a92f6546216824343a340f796f	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties support flexible lengths (the 'fr' unit) within an inline grid, so you can use it to represent a fraction of the free space in the grid container.
-grid-inline-support-grid-template-areas-001		Support for 'grid-template-ares' property within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#grid-template-areas-property	857bebb83eea2ec6f66dac66bf38dc3815bef4c2	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-areas' is supported in an inline grid. So you can define the grid structure.
+grid-inline-support-flexible-lengths-001		Support flexible lengths for 'grid-template-columns' and 'grid-template-rows' properties within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#fr-unit	50df9e55bd1d12e8a82069ec2022df8cfb5f5bd9	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties support flexible lengths (the 'fr' unit) within an inline grid, so you can use it to represent a fraction of the free space in the grid container.
+grid-inline-support-grid-template-areas-001		Support for 'grid-template-ares' property within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#grid-template-areas-property	037e8d6035c98c445a7938c5a56f20f5ff430033	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-areas' is supported in an inline grid. So you can define the grid structure.
 grid-inline-support-grid-template-columns-rows-001		Support for 'grid-template-columns' and 'grid-template-rows' properties within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#track-sizing	236930bb2240e757225dc6b34a82ea0f15f2ec0e	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties are supported in an inline grid. So you can use the different syntax options to define the trak list.
 grid-inline-support-named-grid-lines-001		Support for named grid lines in 'grid-template-columns' and 'grid-template-rows' properties within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#named-lines	315365f9bccd7657245b347cef4ced75b257e302	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that grid lines can be explicitly named in 'grid-template-columns' and 'grid-template-rows' properties within an inline grid.
 grid-inline-support-repeat-001		Support 'repeat()' notation for 'grid-template-columns' and 'grid-template-rows' properties within an inline grid	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#repeat-notation	787c303e5d47217acd31a68b4095e1a31dbdcd1d	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties support 'repeat()' notation within an inline grid, so you can use it to represents a repeated fragment of the track list.
@@ -72,15 +72,15 @@ grid-layout-repeat-notation	reference/grid-layout-repeat-notation-ref	repeat not
 grid-layout-z-order-a	reference/grid-layout-z-order-ref	z order		http://www.w3.org/TR/css-grid-1/#z-order	f6ab122559b3da75e52ceda55f9ec69a76f547cc	`Leo Deng`<mailto:myst.dg@gmail.com>	the layout should behave the same as reference.
 grid-layout-z-order-b	reference/grid-layout-z-order-ref	z order		http://www.w3.org/TR/css-grid-1/#z-order	fc0d9c23d430075933e4db79ab3f8acf2fc8bf8a	`Leo Deng`<mailto:myst.dg@gmail.com>	the layout should behave the same as reference.
 grid-margins-no-collapse-001	reference/grid-text-green-margin-no-collapse-ref	grid's margins do not collapse		http://www.w3.org/TR/css-grid-1/#grid-containers	a2cc4e1ac516408da65ef363beef36c757736f6f	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that grid's margin (body) do not collapse with the marings of the grid item (a paragraph).
-grid-minimun-size-grid-items-001	reference/ref-filled-green-100px-square	Minimun size of grid items	ahem	http://www.w3.org/TR/css-grid-1/#min-size-auto	613e5e003415c0130450183380f315c9e03ad387	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the min-content size.
-grid-minimun-size-grid-items-002	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	8ba15922ec30224f55a66300119ef091bcc61949	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the min-content size.
-grid-minimun-size-grid-items-003	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	8466f7ed95e32d3d1a36e5c72a2132bfadf5476c	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the specified size regardless of the content size.
-grid-minimun-size-grid-items-004	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	20fc5c365dd1bb26b195e4231a632436f866e522	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the specified size regardless of the content size.
-grid-minimun-size-grid-items-005	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	6d579b3cd3b1d2d1da0df2d851c506a8f6203d34	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the min-content size.
-grid-minimun-size-grid-items-006	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	6aa026fabce74ae5bfbc3dcdd69b4b116b489179	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.
-grid-minimun-size-grid-items-007	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	c2d40f75e22894e6651e1aa6e3a74f301e7d8fb0	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.
-grid-minimun-size-grid-items-008	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	cc4f477db54018c7db8553726e9617dfe32a755f	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.
-grid-minimun-size-grid-items-009	reference/ref-filled-green-100px-square	Minimun size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	e4da8e15125cbf0af8a68c689bf7767c58926b57	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.
+grid-minimum-size-grid-items-001	reference/ref-filled-green-100px-square	Minimum size of grid items	ahem	http://www.w3.org/TR/css-grid-1/#min-size-auto	a69269399a2b148e6450ac037c938641e6b90c3e	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the min-content size.
+grid-minimum-size-grid-items-002	reference/ref-filled-green-100px-square	Minimum size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	bd5a3c8c88c5056cbd82e3de5f555ddfda34f64c	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the min-content size.
+grid-minimum-size-grid-items-003	reference/ref-filled-green-100px-square	Minimum size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	b6bde0186a33951cb313396ce8c278ceb38396eb	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the specified size regardless of the content size.
+grid-minimum-size-grid-items-004	reference/ref-filled-green-100px-square	Minimum size of grid items		http://www.w3.org/TR/css-grid-1/#min-size-auto	6aa3dcde25c815d919f566c18fe3b8b72dba7558	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the specified size regardless of the content size.
+grid-minimum-size-grid-items-005	reference/ref-filled-green-100px-square	Minimum size of grid items	image	http://www.w3.org/TR/css-grid-1/#min-size-auto	fd28bce2bd61ecd1b2ceff2bce2782331976a8d8	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the min-content size.
+grid-minimum-size-grid-items-006	reference/ref-filled-green-100px-square	Minimum size of grid items	image	http://www.w3.org/TR/css-grid-1/#min-size-auto	174e283c947342672b4f4f17ca17127e7bf31a38	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.
+grid-minimum-size-grid-items-007	reference/ref-filled-green-100px-square	Minimum size of grid items	image	http://www.w3.org/TR/css-grid-1/#min-size-auto	d588f01baf7d50455025a8977a82da55416567c7	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.
+grid-minimum-size-grid-items-008	reference/ref-filled-green-100px-square	Minimum size of grid items	image	http://www.w3.org/TR/css-grid-1/#min-size-auto	197f82d6f89561a846c9c2ba41e6b812246359b5	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.
+grid-minimum-size-grid-items-009	reference/ref-filled-green-100px-square	Minimum size of grid items	image	http://www.w3.org/TR/css-grid-1/#min-size-auto	fa9da3bd4d0d78e885f4f55d1e0cca3f0ba5210d	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.
 grid-multicol-001	reference/ref-filled-green-100px-square	'column-*' properties from grid container does not apply to grid items		http://www.w3.org/TR/css-grid-1/#grid-containers,http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns	521dbe45e2022be1140904fe6d2513370d6bfef3	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'column-*' properties in the Multicol module are ignored in grid items when applied to a grid container.
 grid-order-property-auto-placement-001	reference/grid-2x2-blue-yellow-lime-magenta	'order' property affects grid items auto-placement position	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	ad5b4e57de7a4ea9fd826be7fca30d6700672fa1	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-order-property-auto-placement-002	reference/grid-2x2-blue-yellow-lime-magenta	'order' property affects grid items auto-placement position	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	d33459a775e8e493e29fe5cd454d1e20eb057f20	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
@@ -93,8 +93,8 @@ grid-order-property-painting-003	reference/ref-filled-green-100px-square	'order'
 grid-order-property-painting-004	reference/ref-filled-green-100px-square	'order' property affects grid items painting order	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	70a79fa9be93b40a976ae83c7adc862d137317ac	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-order-property-painting-005	reference/ref-filled-green-100px-square	'order' property affects grid items painting order	ahem	http://www.w3.org/TR/css-grid-1/#order-property,https://drafts.csswg.org/css-flexbox-1/#order-property	1816a5bb33c6984fa4cd4d0d834d8681391acb9d	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	
 grid-support-display-001		DOM support for 'grid' and 'inline-grid' 'display' values	dom,script	http://www.w3.org/TR/css-grid-1/#grid-containers	18055d2ae743945500cc0444a2658411a0791120	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid' and 'inline-grid' values for 'display' property are supported so that DOM methods, specifically getComputedValue(), and its associated CSS2Properties interface, can fetch such 'display' values.
-grid-support-flexible-lengths-001		Support flexible lengths for 'grid-template-columns' and 'grid-template-rows' properties	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#fr-unit	e48ba1cdab5dee3a3f6a3f2201d8b1b69598b1f5	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties support flexible lengths (the 'fr' unit), so you can use it to represent a fraction of the free space in the grid container.
-grid-support-grid-template-areas-001		Support for 'grid-template-ares' property	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#grid-template-areas-property	dc6323f059179c2e6bdbcf23148b94695ffea11e	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-areas' is supported in a grid. So you can define the grid structure.
+grid-support-flexible-lengths-001		Support flexible lengths for 'grid-template-columns' and 'grid-template-rows' properties	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#fr-unit	d291ecbfb4665d4119d0737beaa4451b306b1b82	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties support flexible lengths (the 'fr' unit), so you can use it to represent a fraction of the free space in the grid container.
+grid-support-grid-template-areas-001		Support for 'grid-template-ares' property	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#grid-template-areas-property	ba4d646749df2afdba6897cfb6cbdf9402f15b6c	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-areas' is supported in a grid. So you can define the grid structure.
 grid-support-grid-template-columns-rows-001		Support for 'grid-template-columns' and 'grid-template-rows' properties	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#track-sizing	9a79b1fd5bc89c0b2dd0a0b38850a15096130f99	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties are supported in a grid. So you can use the different syntax options to define the trak list.
 grid-support-named-grid-lines-001		Support for named grid lines in 'grid-template-columns' and 'grid-template-rows' properties	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#named-lines	7f20858fbf5e857df816ec4eeb5c63a65baefcf9	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that grid lines can be explicitly named in 'grid-template-columns' and 'grid-template-rows' properties.
 grid-support-repeat-001		Support 'repeat()' notation for 'grid-template-columns' and 'grid-template-rows' properties	ahem,dom,script	http://www.w3.org/TR/css-grid-1/#repeat-notation	390f84f3fc36940ba56b755fcc4db6528f1f0faf	`Manuel Rego Casasnovas`<mailto:rego@igalia.com>	This test checks that 'grid-template-columns' and 'grid-template-rows' properties support 'repeat()' notation, so you can use it to represents a repeated fragment of the track list.
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht
index 0d4a1f7f1ad..dfd7cab6a7c 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht
@@ -508,102 +508,102 @@
         <a href="#s4.4">+</a>
         <a href="http://www.w3.org/TR/css-grid-1/#min-size-auto">4.4 Implied Minimum Size of Grid Items</a></th></tr>
       <!-- 9 tests -->
-      <tr id="grid-minimun-size-grid-items-001-4.4" class="primary ahem">
+      <tr id="grid-minimum-size-grid-items-001-4.4" class="primary ahem">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-001.xht">grid-minimun-size-grid-items-001</a></strong></td>
+            <a href="grid-minimum-size-grid-items-001.xht">grid-minimum-size-grid-items-001</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-002-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-002-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-002.xht">grid-minimun-size-grid-items-002</a></strong></td>
+            <a href="grid-minimum-size-grid-items-002.xht">grid-minimum-size-grid-items-002</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-003-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-003-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-003.xht">grid-minimun-size-grid-items-003</a></strong></td>
+            <a href="grid-minimum-size-grid-items-003.xht">grid-minimum-size-grid-items-003</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li>
+            <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-004-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-004-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-004.xht">grid-minimun-size-grid-items-004</a></strong></td>
+            <a href="grid-minimum-size-grid-items-004.xht">grid-minimum-size-grid-items-004</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li>
+            <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-005-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-005-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-005.xht">grid-minimun-size-grid-items-005</a></strong></td>
+            <a href="grid-minimum-size-grid-items-005.xht">grid-minimum-size-grid-items-005</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-006-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-006-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-006.xht">grid-minimun-size-grid-items-006</a></strong></td>
+            <a href="grid-minimum-size-grid-items-006.xht">grid-minimum-size-grid-items-006</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-007-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-007-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-007.xht">grid-minimun-size-grid-items-007</a></strong></td>
+            <a href="grid-minimum-size-grid-items-007.xht">grid-minimum-size-grid-items-007</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-008-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-008-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-008.xht">grid-minimun-size-grid-items-008</a></strong></td>
+            <a href="grid-minimum-size-grid-items-008.xht">grid-minimum-size-grid-items-008</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-009-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-009-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-009.xht">grid-minimun-size-grid-items-009</a></strong></td>
+            <a href="grid-minimum-size-grid-items-009.xht">grid-minimum-size-grid-items-009</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht
index 4c74d156191..f9dbab0e890 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht
@@ -20,7 +20,6 @@
                 display: inline-grid;
                 font: 25px/1 Ahem;
                 color: green;
-                grid-template-columns: auto auto;
             }
         ]]></style>
     </head>
@@ -33,9 +32,7 @@
             em
             <div>it</div>
             em
-        </div>
-        <br />
-        <div class="test-inline-grid-overlapping-green">
+        </div><div class="test-inline-grid-overlapping-green">
             it
             <span>em</span>
             it
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht
index 46b9db8fd13..10acc79dae9 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht
@@ -21,17 +21,13 @@
                 font: 25px/1 Ahem;
                 color: green;
             }
-
-            .two-columns {
-                grid-template-columns: auto auto;
-            }
         ]]></style>
     </head>
     <body>
         <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
         <div id="reference-overlapped-red"></div>
-        <div class="test-inline-grid-overlapping-green two-columns">
+        <div class="test-inline-grid-overlapping-green">
             <div>
                 <div>it</div>
                 em
@@ -40,14 +36,18 @@
                 it
                 <div>em</div>
             </div>
-        </div>
-        <br />
-        <div class="test-inline-grid-overlapping-green">
+        </div><div class="test-inline-grid-overlapping-green">
+            <span>
+                <span>i</span>t
+            </span>
+            <span>
+                e<span>m</span>
+            </span>
             <span>
-                <span>it</span>em
+                <span>i</span>t
             </span>
             <span>
-                it<span>em</span>
+                e<span>m</span>
             </span>
         </div>
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht
index 9796d30b34f..228536737c5 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht
@@ -34,10 +34,10 @@
             TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px");
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht
index 66ec77c3bef..74d1672cdfc 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht
@@ -28,29 +28,29 @@
             TestingUtils.testGridTemplateAreas('inline-grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"', '"a b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "c d"', '"a b" "c d"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"a     b"     "c     d"', '"a b" "c d"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"a     b"     "c     d"', ['"a b" "c d"', '"a     b" "c     d"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b""c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\t"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\n"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "a b"', '"a b" "a b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a a" "b b"', '"a a" "b b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". a ." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', '". a ." "b a c"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']);
             TestingUtils.testGridTemplateAreas('inline-grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". a" "b a" ". a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', '". a" "b a" ". a"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"a a a" "b b b"', '"a a a" "b b b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". ." "a a"', '". ." "a a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', '". ." "a a"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']);
 
             // Reset values.
             document.getElementById('inline-grid').style.gridTemplateAreas = '';
@@ -69,7 +69,7 @@
             TestingUtils.testGridTemplateAreas('inline-grid', '"b a" "b b"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "b a"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a ." ". a"', 'none');
-            TestingUtils.testGridTemplateAreas('inline-grid', '","', '","');
+            TestingUtils.testGridTemplateAreas('inline-grid', '","', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"10%"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"USD$"', 'none');
         ]]></script>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-001.xht
index 213738c9474..7efc9e9d6f4 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-001.xht
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
         <meta name="flags" content="ahem" />
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-002.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-002.xht
index 07c91aadf38..8ee52b12a17 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-002.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-002.xht
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-003.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-003.xht
index 1d110e26c53..c8006f314fc 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-003.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-003.xht
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-004.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-004.xht
index 2b22bc7b19e..e27ac99791e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-004.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-004.xht
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-005.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-005.xht
index e26b6cc9a03..c97286084e8 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-005.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-005.xht
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -26,7 +27,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img src="../support/100x100-green.png" />
+            <img src="support/100x100-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-007.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-006.xht
index 1a55f1c652c..4262ce8c406 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-007.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-006.xht
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-006.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-007.xht
index 53b18f7019b..0a1f23b6f6b 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-006.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-007.xht
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-009.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-008.xht
index 3e314082e34..2b93fdbf062 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-009.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-008.xht
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-008.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-009.xht
index 48517417ed8..05ffc8bbcf1 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-008.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-009.xht
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -30,7 +31,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht
index 517760818af..b9a5abf4b8f 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht
@@ -34,10 +34,10 @@
             TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px");
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht
index ca30fb4c5a9..53eb7611c64 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht
@@ -28,29 +28,29 @@
             TestingUtils.testGridTemplateAreas('grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"', '"a b"');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "c d"', '"a b" "c d"');
-            TestingUtils.testGridTemplateAreas('grid', '"a     b"     "c     d"', '"a b" "c d"');
+            TestingUtils.testGridTemplateAreas('grid', '"a     b"     "c     d"', ['"a b" "c d"', '"a     b" "c     d"']);
             TestingUtils.testGridTemplateAreas('grid', '"a b""c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"\t"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"\n"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "a b"', '"a b" "a b"');
             TestingUtils.testGridTemplateAreas('grid', '"a a" "b b"', '"a a" "b b"');
             TestingUtils.testGridTemplateAreas('grid', '". a ." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', '". a ." "b a c"');
+            TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']);
+            TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']);
             TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."');
+            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']);
+            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']);
             TestingUtils.testGridTemplateAreas('grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."');
+            TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']);
+            TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']);
             TestingUtils.testGridTemplateAreas('grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"');
             TestingUtils.testGridTemplateAreas('grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"');
             TestingUtils.testGridTemplateAreas('grid', '". a" "b a" ". a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', '". a" "b a" ". a"');
+            TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']);
+            TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']);
             TestingUtils.testGridTemplateAreas('grid', '"a a a" "b b b"', '"a a a" "b b b"');
             TestingUtils.testGridTemplateAreas('grid', '". ." "a a"', '". ." "a a"');
-            TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', '". ." "a a"');
+            TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']);
 
             // Reset values.
             document.getElementById('grid').style.gridTemplateAreas = '';
@@ -69,7 +69,7 @@
             TestingUtils.testGridTemplateAreas('grid', '"b a" "b b"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "b a"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"a ." ". a"', 'none');
-            TestingUtils.testGridTemplateAreas('grid', '","', '","');
+            TestingUtils.testGridTemplateAreas('grid', '","', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"10%"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"USD$"', 'none');
         ]]></script>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js
index c4ceec3a805..202c865b15e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js
@@ -18,11 +18,15 @@ var TestingUtils = (function() {
         }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle  + "; and grid-template-rows: " + rowsStyle + ";");
     }
 
+    function checkGridTemplateAreas(element, value) {
+        assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas");
+    }
+
     function testGridTemplateAreas(gridId, style, value) {
         test(function() {
             var grid = document.getElementById(gridId);
             grid.style.gridTemplateAreas = style;
-            assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas");
+            checkGridTemplateAreas(grid, value);
         }, "'" + gridId + "' with: grid-template-areas: " + style + ";");
     }
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht
index 3789b0d3085..4a4822a5580 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht
@@ -544,76 +544,76 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-001" class="ahem">
+    <tbody id="grid-minimum-size-grid-items-001" class="ahem">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-001.xht">grid-minimun-size-grid-items-001</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-001.xht">grid-minimum-size-grid-items-001</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-002" class="">
+    <tbody id="grid-minimum-size-grid-items-002" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-002.xht">grid-minimun-size-grid-items-002</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-002.xht">grid-minimum-size-grid-items-002</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-003" class="">
+    <tbody id="grid-minimum-size-grid-items-003" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-003.xht">grid-minimun-size-grid-items-003</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-003.xht">grid-minimum-size-grid-items-003</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-004" class="">
+    <tbody id="grid-minimum-size-grid-items-004" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-004.xht">grid-minimun-size-grid-items-004</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-004.xht">grid-minimum-size-grid-items-004</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-005" class="">
+    <tbody id="grid-minimum-size-grid-items-005" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-005.xht">grid-minimun-size-grid-items-005</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-005.xht">grid-minimum-size-grid-items-005</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-006" class="">
+    <tbody id="grid-minimum-size-grid-items-006" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-006.xht">grid-minimun-size-grid-items-006</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-006.xht">grid-minimum-size-grid-items-006</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-007" class="">
+    <tbody id="grid-minimum-size-grid-items-007" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-007.xht">grid-minimun-size-grid-items-007</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-007.xht">grid-minimum-size-grid-items-007</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-008" class="">
+    <tbody id="grid-minimum-size-grid-items-008" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-008.xht">grid-minimun-size-grid-items-008</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-008.xht">grid-minimum-size-grid-items-008</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-009" class="">
+    <tbody id="grid-minimum-size-grid-items-009" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-009.xht">grid-minimun-size-grid-items-009</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-009.xht">grid-minimum-size-grid-items-009</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
     <tbody id="grid-multicol-001" class="">
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list
index 70a68b699f9..e609f486ecd 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list
@@ -64,15 +64,15 @@ grid-layout-repeat-notation.xht == reference/grid-layout-repeat-notation-ref.xht
 grid-layout-z-order-a.xht == reference/grid-layout-z-order-ref.xht
 grid-layout-z-order-b.xht == reference/grid-layout-z-order-ref.xht
 grid-margins-no-collapse-001.xht == reference/grid-text-green-margin-no-collapse-ref.xht
-grid-minimun-size-grid-items-001.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-002.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-003.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-004.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-005.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-006.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-007.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-008.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-009.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-001.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-002.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-003.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-004.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-005.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-006.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-007.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-008.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-009.xht == reference/ref-filled-green-100px-square.xht
 grid-multicol-001.xht == reference/ref-filled-green-100px-square.xht
 grid-order-property-auto-placement-001.xht == reference/grid-2x2-blue-yellow-lime-magenta.xht
 grid-order-property-auto-placement-002.xht == reference/grid-2x2-blue-yellow-lime-magenta.xht
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js
index c4ceec3a805..202c865b15e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js
@@ -18,11 +18,15 @@ var TestingUtils = (function() {
         }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle  + "; and grid-template-rows: " + rowsStyle + ";");
     }
 
+    function checkGridTemplateAreas(element, value) {
+        assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas");
+    }
+
     function testGridTemplateAreas(gridId, style, value) {
         test(function() {
             var grid = document.getElementById(gridId);
             grid.style.gridTemplateAreas = style;
-            assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas");
+            checkGridTemplateAreas(grid, value);
         }, "'" + gridId + "' with: grid-template-areas: " + style + ";");
     }
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/chapter-4.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/chapter-4.xht
index 0d4a1f7f1ad..dfd7cab6a7c 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/chapter-4.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/chapter-4.xht
@@ -508,102 +508,102 @@
         <a href="#s4.4">+</a>
         <a href="http://www.w3.org/TR/css-grid-1/#min-size-auto">4.4 Implied Minimum Size of Grid Items</a></th></tr>
       <!-- 9 tests -->
-      <tr id="grid-minimun-size-grid-items-001-4.4" class="primary ahem">
+      <tr id="grid-minimum-size-grid-items-001-4.4" class="primary ahem">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-001.xht">grid-minimun-size-grid-items-001</a></strong></td>
+            <a href="grid-minimum-size-grid-items-001.xht">grid-minimum-size-grid-items-001</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-002-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-002-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-002.xht">grid-minimun-size-grid-items-002</a></strong></td>
+            <a href="grid-minimum-size-grid-items-002.xht">grid-minimum-size-grid-items-002</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-003-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-003-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-003.xht">grid-minimun-size-grid-items-003</a></strong></td>
+            <a href="grid-minimum-size-grid-items-003.xht">grid-minimum-size-grid-items-003</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li>
+            <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-004-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-004-4.4" class="primary">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-004.xht">grid-minimun-size-grid-items-004</a></strong></td>
+            <a href="grid-minimum-size-grid-items-004.xht">grid-minimum-size-grid-items-004</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td></td>
-        <td>Minimun size of grid items
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li>
+            <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-005-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-005-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-005.xht">grid-minimun-size-grid-items-005</a></strong></td>
+            <a href="grid-minimum-size-grid-items-005.xht">grid-minimum-size-grid-items-005</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the min-content size.</li>
+            <li>Checks that minimum size for grid items is the min-content size.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-006-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-006-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-006.xht">grid-minimun-size-grid-items-006</a></strong></td>
+            <a href="grid-minimum-size-grid-items-006.xht">grid-minimum-size-grid-items-006</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-007-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-007-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-007.xht">grid-minimun-size-grid-items-007</a></strong></td>
+            <a href="grid-minimum-size-grid-items-007.xht">grid-minimum-size-grid-items-007</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-008-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-008-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-008.xht">grid-minimun-size-grid-items-008</a></strong></td>
+            <a href="grid-minimum-size-grid-items-008.xht">grid-minimum-size-grid-items-008</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
-      <tr id="grid-minimun-size-grid-items-009-4.4" class="primary">
+      <tr id="grid-minimum-size-grid-items-009-4.4" class="primary image">
         <td><strong>
-            <a href="grid-minimun-size-grid-items-009.xht">grid-minimun-size-grid-items-009</a></strong></td>
+            <a href="grid-minimum-size-grid-items-009.xht">grid-minimum-size-grid-items-009</a></strong></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td></td>
-        <td>Minimun size of grid items
+        <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
+        <td>Minimum size of grid items
           <ul class="assert">
-            <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
+            <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li>
           </ul>
         </td>
       </tr>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-001.xht
index 8f8871fc373..f73b14b41d7 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-001.xht
@@ -29,7 +29,6 @@
                 display: inline-grid;
                 font: 25px/1 Ahem;
                 color: green;
-                grid-template-columns: auto auto;
             }
         ]]></style>
     </head>
@@ -42,9 +41,7 @@
             em
             <div>it</div>
             em
-        </div>
-        <br />
-        <div class="test-inline-grid-overlapping-green">
+        </div><div class="test-inline-grid-overlapping-green">
             it
             <span>em</span>
             it
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-002.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-002.xht
index f4f9860f671..b86f918936a 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-002.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-items-002.xht
@@ -30,17 +30,13 @@
                 font: 25px/1 Ahem;
                 color: green;
             }
-
-            .two-columns {
-                grid-template-columns: auto auto;
-            }
         ]]></style>
     </head>
     <body>
         <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
         <div id="reference-overlapped-red"></div>
-        <div class="test-inline-grid-overlapping-green two-columns">
+        <div class="test-inline-grid-overlapping-green">
             <div>
                 <div>it</div>
                 em
@@ -49,14 +45,18 @@
                 it
                 <div>em</div>
             </div>
-        </div>
-        <br />
-        <div class="test-inline-grid-overlapping-green">
+        </div><div class="test-inline-grid-overlapping-green">
+            <span>
+                <span>i</span>t
+            </span>
+            <span>
+                e<span>m</span>
+            </span>
             <span>
-                <span>it</span>em
+                <span>i</span>t
             </span>
             <span>
-                it<span>em</span>
+                e<span>m</span>
             </span>
         </div>
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-flexible-lengths-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-flexible-lengths-001.xht
index aac29d2d614..f6faaf27ef6 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-flexible-lengths-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-flexible-lengths-001.xht
@@ -43,10 +43,10 @@
             TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px");
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-grid-template-areas-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-grid-template-areas-001.xht
index 10dd97abf79..f055f770ac6 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-grid-template-areas-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-inline-support-grid-template-areas-001.xht
@@ -37,29 +37,29 @@
             TestingUtils.testGridTemplateAreas('inline-grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"', '"a b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "c d"', '"a b" "c d"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"a     b"     "c     d"', '"a b" "c d"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"a     b"     "c     d"', ['"a b" "c d"', '"a     b" "c     d"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b""c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\t"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\n"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "a b"', '"a b" "a b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a a" "b b"', '"a a" "b b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". a ." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', '". a ." "b a c"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']);
             TestingUtils.testGridTemplateAreas('inline-grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"');
             TestingUtils.testGridTemplateAreas('inline-grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". a" "b a" ". a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', '". a" "b a" ". a"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']);
+            TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']);
             TestingUtils.testGridTemplateAreas('inline-grid', '"a a a" "b b b"', '"a a a" "b b b"');
             TestingUtils.testGridTemplateAreas('inline-grid', '". ." "a a"', '". ." "a a"');
-            TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', '". ." "a a"');
+            TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']);
 
             // Reset values.
             document.getElementById('inline-grid').style.gridTemplateAreas = '';
@@ -78,7 +78,7 @@
             TestingUtils.testGridTemplateAreas('inline-grid', '"b a" "b b"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "b a"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"a ." ". a"', 'none');
-            TestingUtils.testGridTemplateAreas('inline-grid', '","', '","');
+            TestingUtils.testGridTemplateAreas('inline-grid', '","', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"10%"', 'none');
             TestingUtils.testGridTemplateAreas('inline-grid', '"USD$"', 'none');
         ]]></script>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-001.xht
index 56b0c004304..e4291fd8413 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-001.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-001"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-001"; }
             @bottom-right { content: counter(page); }
           }
 </style>
@@ -15,7 +15,7 @@
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
         <meta name="flags" content="ahem" />
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-002.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-002.xht
index 5716c221580..d093c98e175 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-002.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-002.xht
@@ -1,20 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-002"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-002"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-003.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-003.xht
index 423ed0d9cc7..54c2c2fee64 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-003.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-003.xht
@@ -1,20 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-003"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-003"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-004.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-004.xht
index b68ffe4df2c..c2e887d6d86 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-004.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-004.xht
@@ -1,20 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-004"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-004"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size." />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-005.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-005.xht
index d25b3259eb5..627b222e3d3 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-005.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-005.xht
@@ -1,20 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-005"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-005"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the min-content size." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the min-content size." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -35,7 +36,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img src="../support/100x100-green.png" />
+            <img src="support/100x100-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-006.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-006.xht
index 5daeae91b9d..4db6ec03ba5 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-006.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-006.xht
@@ -1,20 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-006"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-006"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -39,7 +40,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-007.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-007.xht
index 701887ab2f9..c959ca31f5b 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-007.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-007.xht
@@ -1,20 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-007"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-007"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -39,7 +40,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-008.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-008.xht
index 2903437b032..bddce564773 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-008.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-008.xht
@@ -1,20 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-008"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-008"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -39,7 +40,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-009.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-009.xht
index f6fb2e2b111..23a984d2d89 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimun-size-grid-items-009.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-minimum-size-grid-items-009.xht
@@ -1,20 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>CSS Grid Layout Test: Minimun size of grid items</title>
+        <title>CSS Grid Layout Test: Minimum size of grid items</title>
   <style type="text/css">
     @page { font: italic 8pt sans-serif; color: gray;
             margin: 7%;
             counter-increment: page;
             @top-left { content: "CSS Grid Layout Module Level 1 CR Test Suite"; }
-            @top-right { content: "Test grid-minimun-size-grid-items-009"; }
+            @top-right { content: "Test grid-minimum-size-grid-items-009"; }
             @bottom-right { content: counter(page); }
           }
 </style>
         <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" />
         <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" />
         <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
-        <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
+        <meta name="flags" content="image" />
+        <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that." />
         <style type="text/css"><![CDATA[
             #reference-overlapped-red {
                 position: absolute;
@@ -39,7 +40,7 @@
 
         <div id="reference-overlapped-red"></div>
         <div id="constrained-grid">
-            <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png" />
+            <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled" />
         </div>
 
     </body>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-flexible-lengths-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-flexible-lengths-001.xht
index 9c322b2f72f..15aba3cf8ba 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-flexible-lengths-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-flexible-lengths-001.xht
@@ -43,10 +43,10 @@
             TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px");
-            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px");
+            TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px");
             TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px");
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-grid-template-areas-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-grid-template-areas-001.xht
index 918339b60a4..e43d764dcc3 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-grid-template-areas-001.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/grid-support-grid-template-areas-001.xht
@@ -37,29 +37,29 @@
             TestingUtils.testGridTemplateAreas('grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"', '"a b"');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "c d"', '"a b" "c d"');
-            TestingUtils.testGridTemplateAreas('grid', '"a     b"     "c     d"', '"a b" "c d"');
+            TestingUtils.testGridTemplateAreas('grid', '"a     b"     "c     d"', ['"a b" "c d"', '"a     b" "c     d"']);
             TestingUtils.testGridTemplateAreas('grid', '"a b""c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"\t"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b"\n"c d"', '"a b" "c d"');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "a b"', '"a b" "a b"');
             TestingUtils.testGridTemplateAreas('grid', '"a a" "b b"', '"a a" "b b"');
             TestingUtils.testGridTemplateAreas('grid', '". a ." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', '". a ." "b a c"');
-            TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', '". a ." "b a c"');
+            TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']);
+            TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']);
             TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."');
-            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."');
+            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']);
+            TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']);
             TestingUtils.testGridTemplateAreas('grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."');
-            TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."');
+            TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']);
+            TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']);
             TestingUtils.testGridTemplateAreas('grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"');
             TestingUtils.testGridTemplateAreas('grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"');
             TestingUtils.testGridTemplateAreas('grid', '". a" "b a" ". a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', '". a" "b a" ". a"');
-            TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', '". a" "b a" ". a"');
+            TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']);
+            TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']);
             TestingUtils.testGridTemplateAreas('grid', '"a a a" "b b b"', '"a a a" "b b b"');
             TestingUtils.testGridTemplateAreas('grid', '". ." "a a"', '". ." "a a"');
-            TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', '". ." "a a"');
+            TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']);
 
             // Reset values.
             document.getElementById('grid').style.gridTemplateAreas = '';
@@ -78,7 +78,7 @@
             TestingUtils.testGridTemplateAreas('grid', '"b a" "b b"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"a b" "b a"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"a ." ". a"', 'none');
-            TestingUtils.testGridTemplateAreas('grid', '","', '","');
+            TestingUtils.testGridTemplateAreas('grid', '","', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"10%"', 'none');
             TestingUtils.testGridTemplateAreas('grid', '"USD$"', 'none');
         ]]></script>
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reference/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reference/support/testing-utils.js
index c4ceec3a805..202c865b15e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reference/support/testing-utils.js
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reference/support/testing-utils.js
@@ -18,11 +18,15 @@ var TestingUtils = (function() {
         }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle  + "; and grid-template-rows: " + rowsStyle + ";");
     }
 
+    function checkGridTemplateAreas(element, value) {
+        assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas");
+    }
+
     function testGridTemplateAreas(gridId, style, value) {
         test(function() {
             var grid = document.getElementById(gridId);
             grid.style.gridTemplateAreas = style;
-            assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas");
+            checkGridTemplateAreas(grid, value);
         }, "'" + gridId + "' with: grid-template-areas: " + style + ";");
     }
 
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest-toc.xht
index 3789b0d3085..4a4822a5580 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest-toc.xht
@@ -544,76 +544,76 @@
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-001" class="ahem">
+    <tbody id="grid-minimum-size-grid-items-001" class="ahem">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-001.xht">grid-minimun-size-grid-items-001</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-001.xht">grid-minimum-size-grid-items-001</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-002" class="">
+    <tbody id="grid-minimum-size-grid-items-002" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-002.xht">grid-minimun-size-grid-items-002</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-002.xht">grid-minimum-size-grid-items-002</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-003" class="">
+    <tbody id="grid-minimum-size-grid-items-003" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-003.xht">grid-minimun-size-grid-items-003</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-003.xht">grid-minimum-size-grid-items-003</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-004" class="">
+    <tbody id="grid-minimum-size-grid-items-004" class="">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-004.xht">grid-minimun-size-grid-items-004</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-004.xht">grid-minimum-size-grid-items-004</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
         <td rowspan="1"></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-005" class="">
+    <tbody id="grid-minimum-size-grid-items-005" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-005.xht">grid-minimun-size-grid-items-005</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-005.xht">grid-minimum-size-grid-items-005</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-006" class="">
+    <tbody id="grid-minimum-size-grid-items-006" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-006.xht">grid-minimun-size-grid-items-006</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-006.xht">grid-minimum-size-grid-items-006</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-007" class="">
+    <tbody id="grid-minimum-size-grid-items-007" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-007.xht">grid-minimun-size-grid-items-007</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-007.xht">grid-minimum-size-grid-items-007</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-008" class="">
+    <tbody id="grid-minimum-size-grid-items-008" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-008.xht">grid-minimun-size-grid-items-008</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-008.xht">grid-minimum-size-grid-items-008</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
-    <tbody id="grid-minimun-size-grid-items-009" class="">
+    <tbody id="grid-minimum-size-grid-items-009" class="image">
       <tr>
-        <td rowspan="1" title="Minimun size of grid items">
-          <a href="grid-minimun-size-grid-items-009.xht">grid-minimun-size-grid-items-009</a></td>
+        <td rowspan="1" title="Minimum size of grid items">
+          <a href="grid-minimum-size-grid-items-009.xht">grid-minimum-size-grid-items-009</a></td>
         <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td>
-        <td rowspan="1"></td>
+        <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td>
       </tr>
     </tbody>
     <tbody id="grid-multicol-001" class="">
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest.list
index 70a68b699f9..e609f486ecd 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/reftest.list
@@ -64,15 +64,15 @@ grid-layout-repeat-notation.xht == reference/grid-layout-repeat-notation-ref.xht
 grid-layout-z-order-a.xht == reference/grid-layout-z-order-ref.xht
 grid-layout-z-order-b.xht == reference/grid-layout-z-order-ref.xht
 grid-margins-no-collapse-001.xht == reference/grid-text-green-margin-no-collapse-ref.xht
-grid-minimun-size-grid-items-001.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-002.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-003.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-004.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-005.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-006.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-007.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-008.xht == reference/ref-filled-green-100px-square.xht
-grid-minimun-size-grid-items-009.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-001.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-002.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-003.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-004.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-005.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-006.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-007.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-008.xht == reference/ref-filled-green-100px-square.xht
+grid-minimum-size-grid-items-009.xht == reference/ref-filled-green-100px-square.xht
 grid-multicol-001.xht == reference/ref-filled-green-100px-square.xht
 grid-order-property-auto-placement-001.xht == reference/grid-2x2-blue-yellow-lime-magenta.xht
 grid-order-property-auto-placement-002.xht == reference/grid-2x2-blue-yellow-lime-magenta.xht
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/support/testing-utils.js
index c4ceec3a805..202c865b15e 100644
--- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/support/testing-utils.js
+++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1print/support/testing-utils.js
@@ -18,11 +18,15 @@ var TestingUtils = (function() {
         }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle  + "; and grid-template-rows: " + rowsStyle + ";");
     }
 
+    function checkGridTemplateAreas(element, value) {
+        assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas");
+    }
+
     function testGridTemplateAreas(gridId, style, value) {
         test(function() {
             var grid = document.getElementById(gridId);
             grid.style.gridTemplateAreas = style;
-            assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas");
+            checkGridTemplateAreas(grid, value);
         }, "'" + gridId + "' with: grid-template-areas: " + style + ";");
     }
author	Ms2ger <Ms2ger@gmail.com>	2015-11-30 10:16:54 +0100
committer	Ms2ger <Ms2ger@gmail.com>	2015-11-30 12:21:03 +0100
commit	6bb495338bc5dd2ce4e66ca5e0e69b0016319f07 (patch)
tree	685503020cda0c53793faee76351755c228876e3 /tests/wpt/css-tests/css-grid-1_dev
parent	0f7204936394fe104431f01c68ffa17829426cba (diff)
download	servo-6bb495338bc5dd2ce4e66ca5e0e69b0016319f07.tar.gz servo-6bb495338bc5dd2ce4e66ca5e0e69b0016319f07.zip