diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index cb2edcb5dcd..5e54b53e5d2 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,3 +8,33 @@
   [[data-expected-height\] 4]
     expected: FAIL
 
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 10]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
+    expected: FAIL
+
+  [[data-expected-height\] 5]
+    expected: FAIL
+
+  [[data-expected-height\] 6]
+    expected: FAIL
+
+  [[data-expected-height\] 9]
+    expected: FAIL
+
+  [[data-expected-height\] 8]
+    expected: FAIL
+
+  [[data-expected-height\] 13]
+    expected: FAIL
+
+  [[data-expected-height\] 12]
+    expected: FAIL
+
+  [[data-expected-height\] 11]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini
deleted file mode 100644
index 4143512af62..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-size-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-size-025.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini
index 29126885128..aff9924e070 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini
@@ -1,38 +1,55 @@
 [image-as-flexitem-size-001.html]
   [.flexbox > img 1]
     expected: FAIL
+
   [.flexbox > img 2]
     expected: FAIL
+
   [.flexbox > img 3]
     expected: FAIL
+
   [.flexbox > img 4]
     expected: FAIL
+
   [.flexbox > img 5]
     expected: FAIL
+
   [.flexbox > img 6]
     expected: FAIL
+
   [.flexbox > img 7]
     expected: FAIL
+
   [.flexbox > img 8]
     expected: FAIL
+
   [.flexbox > img 9]
     expected: FAIL
+
   [.flexbox > img 10]
     expected: FAIL
+
   [.flexbox > img 11]
     expected: FAIL
+
   [.flexbox > img 12]
     expected: FAIL
+
   [.flexbox > img 13]
     expected: FAIL
+
   [.flexbox > img 14]
     expected: FAIL
+
   [.flexbox > img 15]
     expected: FAIL
+
   [.flexbox > img 16]
     expected: FAIL
+
   [.flexbox > img 17]
     expected: FAIL
+
   [.flexbox > img 18]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini
index 3684416f5b5..7bcce7c1aef 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini
@@ -2,3 +2,54 @@
   [.flexbox > img 4]
     expected: FAIL
 
+  [.flexbox > img 15]
+    expected: FAIL
+
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 11]
+    expected: FAIL
+
+  [.flexbox > img 10]
+    expected: FAIL
+
+  [.flexbox > img 13]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 18]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
+  [.flexbox > img 8]
+    expected: FAIL
+
+  [.flexbox > img 5]
+    expected: FAIL
+
+  [.flexbox > img 7]
+    expected: FAIL
+
+  [.flexbox > img 6]
+    expected: FAIL
+
+  [.flexbox > img 1]
+    expected: FAIL
+
+  [.flexbox > img 3]
+    expected: FAIL
+
+  [.flexbox > img 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini
index dbe4233a739..5fcdf0ffab5 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini
@@ -2,3 +2,54 @@
   [.flexbox > img 4]
     expected: FAIL
 
+  [.flexbox > img 15]
+    expected: FAIL
+
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 11]
+    expected: FAIL
+
+  [.flexbox > img 10]
+    expected: FAIL
+
+  [.flexbox > img 13]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 18]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
+  [.flexbox > img 8]
+    expected: FAIL
+
+  [.flexbox > img 5]
+    expected: FAIL
+
+  [.flexbox > img 7]
+    expected: FAIL
+
+  [.flexbox > img 6]
+    expected: FAIL
+
+  [.flexbox > img 1]
+    expected: FAIL
+
+  [.flexbox > img 3]
+    expected: FAIL
+
+  [.flexbox > img 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini
index a0b5e69c4be..0a719724afe 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini
@@ -2,3 +2,54 @@
   [.flexbox > img 4]
     expected: FAIL
 
+  [.flexbox > img 15]
+    expected: FAIL
+
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 11]
+    expected: FAIL
+
+  [.flexbox > img 10]
+    expected: FAIL
+
+  [.flexbox > img 13]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 18]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
+  [.flexbox > img 8]
+    expected: FAIL
+
+  [.flexbox > img 5]
+    expected: FAIL
+
+  [.flexbox > img 7]
+    expected: FAIL
+
+  [.flexbox > img 6]
+    expected: FAIL
+
+  [.flexbox > img 1]
+    expected: FAIL
+
+  [.flexbox > img 3]
+    expected: FAIL
+
+  [.flexbox > img 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini
index 10313a2f1a5..ce4f7756978 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini
@@ -1,28 +1,40 @@
 [image-as-flexitem-size-003.html]
   [.flexbox > img 1]
     expected: FAIL
+
   [.flexbox > img 2]
     expected: FAIL
+
   [.flexbox > img 3]
     expected: FAIL
+
   [.flexbox > img 5]
     expected: FAIL
+
   [.flexbox > img 6]
     expected: FAIL
+
   [.flexbox > img 7]
     expected: FAIL
+
   [.flexbox > img 8]
     expected: FAIL
+
   [.flexbox > img 9]
     expected: FAIL
+
   [.flexbox > img 14]
     expected: FAIL
+
   [.flexbox > img 15]
     expected: FAIL
+
   [.flexbox > img 16]
     expected: FAIL
+
   [.flexbox > img 17]
     expected: FAIL
+
   [.flexbox > img 18]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini
index a5ee3d5d75b..26de3019b19 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini
@@ -1,28 +1,40 @@
 [image-as-flexitem-size-003v.html]
   [.flexbox > img 1]
     expected: FAIL
+
   [.flexbox > img 2]
     expected: FAIL
+
   [.flexbox > img 3]
     expected: FAIL
+
   [.flexbox > img 5]
     expected: FAIL
+
   [.flexbox > img 6]
     expected: FAIL
+
   [.flexbox > img 7]
     expected: FAIL
+
   [.flexbox > img 8]
     expected: FAIL
+
   [.flexbox > img 9]
     expected: FAIL
+
   [.flexbox > img 14]
     expected: FAIL
+
   [.flexbox > img 15]
     expected: FAIL
+
   [.flexbox > img 16]
     expected: FAIL
+
   [.flexbox > img 17]
     expected: FAIL
+
   [.flexbox > img 18]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini
index da649930a95..0420f1387fa 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini
@@ -32,3 +32,24 @@
   [.flexbox > img 3]
     expected: FAIL
 
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 18]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
+  [.flexbox > img 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini
index 2a0b3330dc4..87ad848b1e9 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini
@@ -32,3 +32,24 @@
   [.flexbox > img 3]
     expected: FAIL
 
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 18]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
+  [.flexbox > img 2]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
index ccc0bc2253a..d9323a568f4 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
@@ -41,3 +41,15 @@
   [.flexbox > img 2]
     expected: FAIL
 
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
index 485a6a07486..991f4186279 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
@@ -4,7 +4,7 @@
 
   [.flexbox > img 12]
     expected: FAIL
-  
+
   [.flexbox > img 14]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006.html.ini
index 3dc2eb00fc7..f66d036cbc8 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006.html.ini
@@ -41,3 +41,15 @@
   [.flexbox > img 2]
     expected: FAIL
 
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 11]
+    expected: FAIL
+
+  [.flexbox > img 10]
+    expected: FAIL
+
+  [.flexbox > img 13]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006v.html.ini
index 157390c0b1e..280b709ec59 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-006v.html.ini
@@ -1,12 +1,16 @@
 [image-as-flexitem-size-006v.html]
   [.flexbox > img 10]
     expected: FAIL
+
   [.flexbox > img 11]
     expected: FAIL
+
   [.flexbox > img 13]
     expected: FAIL
+
   [.flexbox > img 10]
     expected: FAIL
+
   [.flexbox > img 15]
     expected: FAIL
 
@@ -49,3 +53,6 @@
   [.flexbox > img 2]
     expected: FAIL
 
+  [.flexbox > img 16]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini
index 315082e65da..d6a66ba2c91 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini
@@ -1,38 +1,55 @@
 [image-as-flexitem-size-007.html]
   [.flexbox > img 1]
     expected: FAIL
+
   [.flexbox > img 2]
     expected: FAIL
+
   [.flexbox > img 3]
     expected: FAIL
+
   [.flexbox > img 4]
     expected: FAIL
+
   [.flexbox > img 5]
     expected: FAIL
+
   [.flexbox > img 6]
     expected: FAIL
+
   [.flexbox > img 7]
     expected: FAIL
+
   [.flexbox > img 8]
     expected: FAIL
+
   [.flexbox > img 9]
     expected: FAIL
+
   [.flexbox > img 10]
     expected: FAIL
+
   [.flexbox > img 11]
     expected: FAIL
+
   [.flexbox > img 12]
     expected: FAIL
+
   [.flexbox > img 13]
     expected: FAIL
+
   [.flexbox > img 14]
     expected: FAIL
+
   [.flexbox > img 15]
     expected: FAIL
+
   [.flexbox > img 16]
     expected: FAIL
+
   [.flexbox > img 17]
     expected: FAIL
+
   [.flexbox > img 18]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini
index 416bfb37196..0e2bee75827 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini
@@ -2,3 +2,54 @@
   [.flexbox > img 4]
     expected: FAIL
 
+  [.flexbox > img 15]
+    expected: FAIL
+
+  [.flexbox > img 14]
+    expected: FAIL
+
+  [.flexbox > img 17]
+    expected: FAIL
+
+  [.flexbox > img 16]
+    expected: FAIL
+
+  [.flexbox > img 11]
+    expected: FAIL
+
+  [.flexbox > img 10]
+    expected: FAIL
+
+  [.flexbox > img 13]
+    expected: FAIL
+
+  [.flexbox > img 12]
+    expected: FAIL
+
+  [.flexbox > img 18]
+    expected: FAIL
+
+  [.flexbox > img 9]
+    expected: FAIL
+
+  [.flexbox > img 8]
+    expected: FAIL
+
+  [.flexbox > img 5]
+    expected: FAIL
+
+  [.flexbox > img 7]
+    expected: FAIL
+
+  [.flexbox > img 6]
+    expected: FAIL
+
+  [.flexbox > img 1]
+    expected: FAIL
+
+  [.flexbox > img 3]
+    expected: FAIL
+
+  [.flexbox > img 2]
+    expected: FAIL
+