Add Minor fixes and tests

199 files changed, 34 insertions, 611 deletions

diff --git a/components/layout/block.rs b/components/layout/block.rs
index f1501411fe1..16a837d4dcc 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -3089,7 +3089,7 @@ impl ISizeAndMarginsComputer for FlexItem {
                                                                 container_block_size);
     }
 
-    // Literally do nothing.
+    // The used inline size and margins are set by parent flex flow, do nothing here.
     fn solve_inline_size_constraints(&self,
                                      block: &mut BlockFlow,
                                      _: &ISizeConstraintInput)
diff --git a/components/layout/flex.rs b/components/layout/flex.rs
index f551cff88af..f591f023f04 100644
--- a/components/layout/flex.rs
+++ b/components/layout/flex.rs
@@ -55,13 +55,13 @@ impl AxisSize {
                     Some(size) => AxisSize::Definite(size.scale_by(percent)),
                     None => AxisSize::Infinite
                 }
-            },
+            }
             LengthOrPercentageOrAuto::Calc(calc) => {
                 match content_size {
                     Some(size) => AxisSize::Definite(size.scale_by(calc.percentage())),
                     None => AxisSize::Infinite
                 }
-            },
+            }
             LengthOrPercentageOrAuto::Auto => {
                 AxisSize::MinMax(MinMaxConstraint::new(content_size, min, max))
             }
@@ -136,7 +136,7 @@ impl FlexItem {
         let flex_grow = style.get_position().flex_grow;
         let flex_shrink = style.get_position().flex_shrink;
         let order = style.get_position().order;
-        // TODO(stshine): for item with visibility:collapse, set is_strut to true.
+        // TODO(stshine): for item with 'visibility:collapse', set is_strut to true.
 
         FlexItem {
             main_size: Au(0),
@@ -196,7 +196,7 @@ impl FlexItem {
         }
     }
 
-    /// Return the outer main size of the item, including paddings and margins,
+    /// Returns the outer main size of the item, including paddings and margins,
     /// clamped by max and min size.
     pub fn outer_main_size(&self, direction: Direction) -> Au {
         let ref fragment = self.flow.as_block().fragment;
@@ -212,7 +212,8 @@ impl FlexItem {
             - fragment.box_sizing_boundary(direction) + outer_width
     }
 
-    pub fn auto_margin_num(&self, direction: Direction) -> i32 {
+    /// Returns the number of auto margins in given direction.
+    pub fn auto_margin_count(&self, direction: Direction) -> i32 {
         let margin = self.style.logical_margin();
         let mut margin_count = 0;
         match direction {
@@ -243,9 +244,9 @@ impl FlexItem {
 struct FlexLine {
     /// Range of items belong to this line in 'self.items'.
     pub range: Range<usize>,
-    /// Remainig free space of this line, items will grow or shrink based on it being positive or negative.
+    /// Remaining free space of this line, items will grow or shrink based on it being positive or negative.
     pub free_space: Au,
-    /// the number of auto margins of items.
+    /// The number of auto margins of items.
     pub auto_margin_count: i32,
     /// Line size in the block direction.
     pub cross_size: Au,
@@ -262,7 +263,7 @@ impl FlexLine {
     }
 
     /// This method implements the flexible lengths resolving algorithm.
-    /// The 'collapse' parameter is used to indicate whether items with 'visibility: hidden'
+    /// The 'collapse' parameter is used to indicate whether items with 'visibility: collapse'
     /// is included in length resolving. The result main size is stored in 'item.main_size'.
     /// https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths
     pub fn flex_resolve(&mut self, items: &mut [FlexItem], collapse: bool) {
@@ -399,15 +400,11 @@ impl FlexFlow {
     /// Note that when the container main size is infinite(i.e. A column flexbox with auto height),
     /// we do not need to do flex resolving and this can be considered as a fast-path, so the
     /// 'container_size' param does not need to be 'None'. A line has to contain at least one item;
-    /// (expect this) if the container can be multi-line the sum of outer main size of items should
+    /// (except this) if the container can be multi-line the sum of outer main size of items should
     /// be less than the container size; a line should be filled by items as much as possible.
     /// After been collected in a line a item should have its main sizes initialized.
     fn get_flex_line(&mut self, container_size: Au) -> Option<FlexLine> {
-        let start = if self.lines.len() == 0 {
-            0
-        } else {
-            self.lines[self.lines.len()-1].range.end
-        };
+        let start = self.lines.last().map(|line| line.range.end).unwrap_or(0);
         if start == self.items.len() {
             return None;
         }
@@ -416,13 +413,13 @@ impl FlexFlow {
         let mut margin_count = 0;
 
         let items = &mut self.items[start..];
-        for mut item in items.iter_mut() {
+        for mut item in items {
             item.init_sizes(container_size, self.main_mode);
             let outer_main_size = item.outer_main_size(self.main_mode);
-            if total_line_size + outer_main_size > container_size && end != start  && self.is_wrappable {
+            if total_line_size + outer_main_size > container_size && end != start && self.is_wrappable {
                 break;
             }
-            margin_count += item.auto_margin_num(self.main_mode);
+            margin_count += item.auto_margin_count(self.main_mode);
             total_line_size += outer_main_size;
             end += 1;
         }
@@ -563,7 +560,7 @@ impl FlexFlow {
         let explicit_content_size = self
                                     .block_flow
                                     .explicit_block_size(parent_container_size)
-                                    .map(|x| if x < box_border { Au(0) } else { x - box_border });
+                                    .map(|x| max(x - box_border, Au(0)));
         let containing_block_text_align =
             self.block_flow.fragment.style().get_inheritedtext().text_align;
 
@@ -571,7 +568,7 @@ impl FlexFlow {
             let items = &mut self.items[line.range.clone()];
             line.flex_resolve(items, false);
             // TODO(stshine): if this flex line contain children that have
-            // property visibility:hidden, exclude them and resolve again.
+            // property visibility:collapse, exclude them and resolve again.
 
             let item_count = items.len() as i32;
             let mut cur_i = inline_start_content_edge;
@@ -583,10 +580,10 @@ impl FlexFlow {
                         } else {
                             line.free_space / (item_count - 1)
                         }
-                    },
+                    }
                     justify_content::T::space_around => {
                         line.free_space / item_count
-                    },
+                    }
                     _ => Au(0),
                 }
             } else {
@@ -594,7 +591,7 @@ impl FlexFlow {
             };
 
             match self.block_flow.fragment.style().get_position().justify_content {
-                // Overflow equally in both end.
+                // Overflow equally in both ends of line.
                 justify_content::T::center | justify_content::T::space_around => {
                     cur_i += (line.free_space - item_interval * (item_count - 1)) / 2;
                 }
@@ -711,12 +708,12 @@ impl FlexFlow {
                     if line_count == 1 {
                         Au(0)
                     } else {
-                        free_space /(line_count - 1)
+                        free_space / (line_count - 1)
                     }
-                },
+                }
                 align_content::T::space_around => {
                     free_space / line_count
-                },
+                }
                 _ => Au(0),
             };
 
@@ -733,7 +730,7 @@ impl FlexFlow {
 
         for line in &self.lines {
             for mut item in self.items[line.range.clone()].iter_mut() {
-                let auto_margin_count = item.auto_margin_num(Direction::Block);
+                let auto_margin_count = item.auto_margin_count(Direction::Block);
                 let mut block = flow_ref::deref_mut(&mut item.flow).as_mut_block();
                 let margin = block.fragment.style().logical_margin();
 
@@ -773,7 +770,7 @@ impl FlexFlow {
                     if !self.cross_reverse {
                         cur_b
                     } else {
-                        self.block_flow.fragment.border_padding.block_start *2
+                        self.block_flow.fragment.border_padding.block_start * 2
                             + total_cross_size - cur_b - line.cross_size
                     };
                 // TODO(stshine): support baseline alignment.
@@ -902,7 +899,7 @@ impl Flow for FlexFlow {
                                                      inline_start_content_edge,
                                                      inline_end_content_edge,
                                                      content_inline_size)
-            },
+            }
             Direction::Block  => {
                 self.available_main_size = available_block_size;
                 self.available_cross_size = available_inline_size;
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 217ee90584d..6a6071aa3c7 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -1102,6 +1102,8 @@ impl Fragment {
         }
     }
 
+    /// Returns the border width in given direction if this fragment has property
+    /// 'box-sizing: border-box'. The `border_padding` field should have been initialized.
     pub fn box_sizing_boundary(&self, direction: Direction) -> Au {
         match (self.style().get_position().box_sizing, direction) {
             (box_sizing::T::border_box, Direction::Inline) => {
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini
deleted file mode 100644
index c410cf86896..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[align-content-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini
deleted file mode 100644
index b27fb3ad6f1..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[align-content-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini
deleted file mode 100644
index a260fbe21af..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[align-content-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini
deleted file mode 100644
index eb31ad82019..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[align-content-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini
deleted file mode 100644
index fab42a5cf0b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[align-content-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini
deleted file mode 100644
index 6269e2dd181..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[align-self-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini
deleted file mode 100644
index a377b889268..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-box-justify-content.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini
deleted file mode 100644
index 5593f3ffa96..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini
deleted file mode 100644
index 4df379c30a2..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini
deleted file mode 100644
index 5fdc2326348..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini
deleted file mode 100644
index 78295d3c161..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-align-items-center.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini
deleted file mode 100644
index 2fd1aac425d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini
deleted file mode 100644
index 06e0a5f0add..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini
deleted file mode 100644
index 8c9995a0386..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini
deleted file mode 100644
index f383bd4c0fb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini
deleted file mode 100644
index a1bb49f5b10..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini
deleted file mode 100644
index 57a4f3ed871..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini
deleted file mode 100644
index 1086a689543..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-basis-008.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini
deleted file mode 100644
index 4f185923ea2..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-box-wrap.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini
deleted file mode 100644
index 97db63cb4fb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-container-margin.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini
deleted file mode 100644
index 6797bda6176..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-direction-modify.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini
deleted file mode 100644
index a88c1394b57..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flow-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini
deleted file mode 100644
index 44a2e011b8d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flow-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini
deleted file mode 100644
index 02f8968c83a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flow-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini
deleted file mode 100644
index f0109bdadd4..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flow-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini
deleted file mode 100644
index 90e7606b7ce..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flow-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini
deleted file mode 100644
index a9933ee0c06..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-flow-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini
deleted file mode 100644
index 978a4faf80b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-grow-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini
deleted file mode 100644
index c7f4a46a6f0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-grow-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini
deleted file mode 100644
index c1ffdb9dcac..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-grow-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini
deleted file mode 100644
index adf9c43dbf4..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-grow-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini
deleted file mode 100644
index bd6ce48df78..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-items-flexibility.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini
deleted file mode 100644
index 9575d290198..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini
deleted file mode 100644
index c7c61bf4e7d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini
deleted file mode 100644
index b70170a52b1..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini
deleted file mode 100644
index 7a7c35c513a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini
deleted file mode 100644
index 79c941f95db..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini
deleted file mode 100644
index 125d4a121e5..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-006.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini
deleted file mode 100644
index abb57eef366..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-shrink-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini
deleted file mode 100644
index 54923b9c528..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-abspos-child-001a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini
deleted file mode 100644
index 9122a0ef3cb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-anonymous-items-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini
deleted file mode 100644
index d19bfd9b84f..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-basic-block-horiz-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini
deleted file mode 100644
index f2d8edb602f..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-flex-wrap-default.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini
deleted file mode 100644
index 95b7876cab5..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-flex-wrap-horiz-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini
deleted file mode 100644
index 10f83d241c1..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-flex-wrap-horiz-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini
deleted file mode 100644
index 8833453c17c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-flex-wrap-nowrap.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini
deleted file mode 100644
index 3e5b12e5ab4..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-items-as-stacking-contexts-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini
deleted file mode 100644
index 0547b3a465a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-items-as-stacking-contexts-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini
deleted file mode 100644
index 8bb6f9d9bc6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-justify-content-horiz-001a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini
deleted file mode 100644
index 8dae762b63b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-justify-content-horiz-001b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini
deleted file mode 100644
index 44399cfd7d5..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-justify-content-horiz-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini
deleted file mode 100644
index b6c1e86f297..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-001-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini
deleted file mode 100644
index d4a81a2b270..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini
deleted file mode 100644
index 3716b7622c6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-002a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini
deleted file mode 100644
index dfb347076e2..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-002b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini
deleted file mode 100644
index cb097e09578..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-003-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini
deleted file mode 100644
index ed6f23ff1ca..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini
deleted file mode 100644
index 66c2432e227..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-whitespace-handling-001b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini
deleted file mode 100644
index 1a551dffca8..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-writing-mode-007.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini
deleted file mode 100644
index 36f3dd5eeed..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-center.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini
deleted file mode 100644
index 8eef80ce02d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-flexend.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini
deleted file mode 100644
index ebde49128d7..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-flexstart.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini
deleted file mode 100644
index 1b82b37e63a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-spacearound.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini
deleted file mode 100644
index 1d42640763a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-spacebetween.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini
deleted file mode 100644
index b1b7e2da7e0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-stretch-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini
deleted file mode 100644
index b60227667d0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-content-stretch.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini
deleted file mode 100644
index 2eef1ee8486..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-center-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini
deleted file mode 100644
index b08896131c1..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-center.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini
deleted file mode 100644
index 80b8334ccb3..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-flexend-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini
deleted file mode 100644
index 0bf418a4672..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-flexend.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini
deleted file mode 100644
index 2c5f28d8833..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-flexstart-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini
deleted file mode 100644
index a3745be75ba..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-flexstart.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini
new file mode 100644
index 00000000000..bb252206b40
--- /dev/null
+++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini
@@ -0,0 +1,3 @@
+[flexbox_align-items-stretch-writing-modes.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini
deleted file mode 100644
index f8e851863e3..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-items-stretch.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini
deleted file mode 100644
index 0815f70b834..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-self-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini
deleted file mode 100644
index bb724adb1a0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-self-baseline.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini
deleted file mode 100644
index 9f03588b774..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-self-center.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini
deleted file mode 100644
index 7584512da96..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-self-flexend.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini
deleted file mode 100644
index 8201a7d8e61..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-self-flexstart.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini
deleted file mode 100644
index 653a79cc0c6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_align-self-stretch.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini
index 914e6b9e418..c37a3dee6e6 100644
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini
+++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini
@@ -1,5 +1,4 @@
 [flexbox_computedstyle_min-width-auto.htm]
   type: testharness
-  [flexbox | computed style | min-width: auto]
-    expected: FAIL
+  expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini
index ce77d1c5204..4b0333dd2cf 100644
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini
+++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini
@@ -1,3 +1,4 @@
 [flexbox_direction-row-reverse.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "mac": FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini
deleted file mode 100644
index da1bcbe0a99..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-1-unitless-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini
deleted file mode 100644
index ee71e23f76b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini
deleted file mode 100644
index dc749a5fe6c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-N-unitless-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini
deleted file mode 100644
index 8202e518f7d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini
deleted file mode 100644
index fb0b6db1307..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini
deleted file mode 100644
index 8a94ed4c07f..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini
deleted file mode 100644
index 896d819e14a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini
deleted file mode 100644
index ce631c77046..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-0-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini
deleted file mode 100644
index 3b20e5e4c4f..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-1-unitless-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini
deleted file mode 100644
index 209cb8b3c27..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini
deleted file mode 100644
index 15edbf4a0cf..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-N-unitless-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini
deleted file mode 100644
index cbdbff4d81b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini
deleted file mode 100644
index 2e037cb9cc8..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini
deleted file mode 100644
index 682695341c2..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini
deleted file mode 100644
index 1119ac00025..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini
deleted file mode 100644
index 1d536d55ca0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-1-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini
deleted file mode 100644
index ada6093c62d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-N-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini
deleted file mode 100644
index c4a56935d67..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-N-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini
deleted file mode 100644
index c3290d05f9a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-N-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini
deleted file mode 100644
index 34fc365395b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-N-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini
deleted file mode 100644
index db7766b9f16..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-N-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini
deleted file mode 100644
index 79e6cfcb278..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-N-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini
deleted file mode 100644
index 2542d60624e..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-0-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini
deleted file mode 100644
index 629f0ed1777..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-0-unitless.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini
deleted file mode 100644
index 5756e83d53b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini
deleted file mode 100644
index d8db8e40c0a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini
deleted file mode 100644
index 83087a42ff8..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini
deleted file mode 100644
index ad63834cd8c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini
deleted file mode 100644
index d6036f30848..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini
deleted file mode 100644
index aa55998d5ef..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini
deleted file mode 100644
index 4c80b43c1fb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini
deleted file mode 100644
index bf84279e6ea..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini
deleted file mode 100644
index f04a5fac595..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-0-unitless.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini
deleted file mode 100644
index 365f91127bb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini
deleted file mode 100644
index 527099cf9ed..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini
deleted file mode 100644
index 6602831954c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini
deleted file mode 100644
index 12dcc655705..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini
deleted file mode 100644
index c4c1ee7b0a9..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini
deleted file mode 100644
index 7c2d43dac09..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini
deleted file mode 100644
index 9037d9332cc..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini
deleted file mode 100644
index 2a6c1ef0a55..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-1.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini
deleted file mode 100644
index a4a0e06dad9..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-0-unitless.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini
deleted file mode 100644
index b37972216b0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini
deleted file mode 100644
index 163c4e1a92b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini
deleted file mode 100644
index fdeb42e10af..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini
deleted file mode 100644
index 4b6a0c29735..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini
deleted file mode 100644
index 8656be71f4f..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini
deleted file mode 100644
index d9acd3f1c14..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini
deleted file mode 100644
index 826db9b7bd7..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini
deleted file mode 100644
index 0582b6b6c34..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-1-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini
deleted file mode 100644
index b161ce67496..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-0-unitless.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini
deleted file mode 100644
index 93115475067..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini
deleted file mode 100644
index 4757195006e..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini
deleted file mode 100644
index 64d4ddd6d05..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini
deleted file mode 100644
index 87756bf1840..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini
deleted file mode 100644
index 83d2fe4f571..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini
deleted file mode 100644
index 8fa895a7cf5..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini
deleted file mode 100644
index a7736fbc28a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini
deleted file mode 100644
index 2f8044035c3..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini
deleted file mode 100644
index 0e21928d5d0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-0-unitless.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini
deleted file mode 100644
index 339053b156b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini
deleted file mode 100644
index 0d8c15211a0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini
deleted file mode 100644
index 9361d5925aa..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini
deleted file mode 100644
index 60c66eb7ef1..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini
deleted file mode 100644
index 0c8ba1aa144..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini
deleted file mode 100644
index 466763eda69..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini
deleted file mode 100644
index 53b8a6cdbf7..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini
deleted file mode 100644
index c8499e53492..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-1.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini
deleted file mode 100644
index d058980b605..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-0-unitless.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini
deleted file mode 100644
index 9efa39aa7f9..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-0.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini
deleted file mode 100644
index 6168a2908c9..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-N-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini
deleted file mode 100644
index 6f55bdf454c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini
deleted file mode 100644
index d85b0204a7c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-Npercent-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini
deleted file mode 100644
index 8e9f14b950c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-Npercent.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini
deleted file mode 100644
index 52140d5342e..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-auto-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini
deleted file mode 100644
index 28bd2a64a04..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini
deleted file mode 100644
index c91665589e6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-N-N.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini
deleted file mode 100644
index dd6f10faa5f..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini
deleted file mode 100644
index 44a529e4ffc..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-basis-shrink.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini
deleted file mode 100644
index 1f6e9abcf6a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini
deleted file mode 100644
index a41c6caf8d8..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-initial-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini
deleted file mode 100644
index 2250d661273..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-initial.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini
deleted file mode 100644
index a44166c314c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-natural-mixed-basis-auto.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini
deleted file mode 100644
index 081efd27e41..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-natural-mixed-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini
deleted file mode 100644
index 168ad7b4685..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-natural-variable-auto-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini
deleted file mode 100644
index 935e588bfd6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-natural-variable-zero-basis.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini
deleted file mode 100644
index 850870ed2a6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-natural.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini
deleted file mode 100644
index 9390f510230..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flex-none.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini
deleted file mode 100644
index a63111f64f5..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flow-row-wrap-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini
deleted file mode 100644
index 251bc2bcf7b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_flow-row-wrap.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini
deleted file mode 100644
index ce7a84ae48a..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_item-vertical-align.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini
deleted file mode 100644
index eccc2325909..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-spacearound-only.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini
deleted file mode 100644
index 4f42ecad4a4..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_margin-auto-overflow-2.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini
deleted file mode 100644
index 971935e8a0c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_margin-auto-overflow.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini
deleted file mode 100644
index f1a8293c048..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_margin-left-ex.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini
deleted file mode 100644
index e4d1a714c78..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_order-abspos-space-around.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini
deleted file mode 100644
index b032b8e9eef..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_order-box.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini
deleted file mode 100644
index 0dcbb98d249..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_wrap-long.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini
deleted file mode 100644
index d94f03626ad..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_wrap-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini
deleted file mode 100644
index 2ac9242ab18..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_wrap.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini
deleted file mode 100644
index 8bbb6234137..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[justify-content-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini
deleted file mode 100644
index 46f575fda25..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[justify-content-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini
deleted file mode 100644
index 605c363d7a1..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[justify-content-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini
deleted file mode 100644
index cb5c4edb458..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[justify-content-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini
deleted file mode 100644
index edbe72ec7a6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[justify-content-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini
deleted file mode 100644
index 818be990490..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[order-with-row-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini
deleted file mode 100644
index 8c1dd22ac1b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-align-content-center.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini
deleted file mode 100644
index a2e05764223..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-align-content-end.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini
deleted file mode 100644
index 7d6c2ff3948..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-align-content-space-around.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini
deleted file mode 100644
index fd9758aca44..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-align-content-space-between.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini
deleted file mode 100644
index 9bc009d1ae8..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-align-content-start.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini
deleted file mode 100644
index 8eb995c7de6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-base.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini
deleted file mode 100644
index 647f5e9edb3..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-direction-row-reverse.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini
deleted file mode 100644
index 46d9fbce936..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-order.htm]
-  type: reftest
-  expected: FAIL