diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/two-animation-diff-length.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/two-animation-diff-length.html.ini
new file mode 100644
index 00000000000..ee2a74435c9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/animations/two-animation-diff-length.html.ini
@@ -0,0 +1,2 @@
+[two-animation-diff-length.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-column-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-column-1.html.ini
new file mode 100644
index 00000000000..75267327022
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-column-1.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-column-1.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-column-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-column-2.html.ini
new file mode 100644
index 00000000000..91f810f44b5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-column-2.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-column-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-row-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-row-1.html.ini
new file mode 100644
index 00000000000..7667ce7e1c1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-row-1.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-row-1.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-row-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-row-2.html.ini
new file mode 100644
index 00000000000..69f39edd163
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-inflexible-in-row-2.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-row-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-stretch-cross-size-3.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-stretch-cross-size-3.html.ini
new file mode 100644
index 00000000000..3c3c145d859
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-stretch-cross-size-3.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-stretch-cross-size-3.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini
index 8a7b9d49c10..5aa97a62ffc 100644
--- a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini
@@ -38,3 +38,6 @@
   [Test @font-face matching for weight 250]
     expected: FAIL
 
+  [Test @font-face matching for weight 420]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index 2cac2149cf7..c495e1becc7 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -1,22 +1,10 @@
 [properties-value-001.html]
-  [outline-width length(px) / values]
-    expected: FAIL
-
   [background-position length(pt) / values]
     expected: FAIL
 
   [background-position length(pt) / events]
     expected: FAIL
 
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [outline-offset length(px) / values]
-    expected: FAIL
-
-  [vertical-align length(in) / values]
-    expected: FAIL
-
   [background-position length(px) / values]
     expected: FAIL
 
@@ -26,246 +14,315 @@
   [background-position length(mm) / values]
     expected: FAIL
 
-  [vertical-align percentage(%) / values]
-    expected: FAIL
-
   [background-position length(in) / events]
     expected: FAIL
 
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [vertical-align length(em) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
   [background-position length(em) / events]
     expected: FAIL
 
-  [outline-offset length(ex) / values]
-    expected: FAIL
-
-  [vertical-align length(pc) / values]
-    expected: FAIL
-
-  [vertical-align length(cm) / values]
-    expected: FAIL
-
-  [vertical-align length(ex) / values]
-    expected: FAIL
-
-  [outline-offset length(mm) / values]
-    expected: FAIL
-
-  [outline-offset length(pt) / values]
-    expected: FAIL
-
-  [vertical-align length(pt) / values]
-    expected: FAIL
-
   [background-position length(ex) / values]
     expected: FAIL
 
-  [text-indent length(mm) / values]
-    expected: FAIL
-
   [background-position length(cm) / values]
     expected: FAIL
 
-  [outline-offset length(in) / values]
-    expected: FAIL
-
-  [outline-width length(pt) / values]
-    expected: FAIL
-
-  [outline-width length(in) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [outline-color color(rgba) / values]
-    expected: FAIL
-
   [background-position length(ex) / events]
     expected: FAIL
 
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
   [background-position length(pc) / events]
     expected: FAIL
 
-  [outline-width length(ex) / values]
-    expected: FAIL
-
   [background-position length(in) / values]
     expected: FAIL
 
-  [outline-width length(cm) / values]
-    expected: FAIL
-
-  [outline-width length(mm) / values]
-    expected: FAIL
-
-  [outline-width length(pc) / values]
-    expected: FAIL
-
-  [vertical-align length(px) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
   [background-position length(pc) / values]
     expected: FAIL
 
   [background-position percentage(%) / values]
     expected: FAIL
 
-  [outline-width length(em) / values]
-    expected: FAIL
-
-  [outline-offset length(em) / values]
-    expected: FAIL
-
-  [outline-offset length(cm) / values]
-    expected: FAIL
-
   [background-position length(mm) / events]
     expected: FAIL
 
-  [vertical-align length(mm) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
   [background-position length(em) / values]
     expected: FAIL
 
-  [outline-offset length(pc) / values]
-    expected: FAIL
-
   [background-position percentage(%) / events]
     expected: FAIL
 
   [background-position length(px) / events]
     expected: FAIL
 
-  [outline-width length(pc) / events]
+  [background-color color(rgba) / values]
     expected: FAIL
 
-  [text-indent percentage(%) / events]
+  [border-top-width length(pt) / values]
     expected: FAIL
 
-  [vertical-align length(px) / events]
+  [border-top-width length(pc) / values]
     expected: FAIL
 
-  [text-shadow shadow(shadow) / events]
+  [border-top-width length(px) / values]
     expected: FAIL
 
-  [outline-offset length(mm) / events]
+  [border-top-width length(em) / values]
     expected: FAIL
 
-  [vertical-align length(in) / events]
+  [border-top-width length(ex) / values]
     expected: FAIL
 
-  [text-indent length(mm) / events]
+  [border-top-width length(mm) / values]
     expected: FAIL
 
-  [vertical-align length(em) / events]
+  [border-top-width length(cm) / values]
     expected: FAIL
 
-  [vertical-align length(cm) / events]
+  [border-top-width length(in) / values]
     expected: FAIL
 
-  [text-indent length(ex) / events]
+  [border-right-width length(pt) / values]
     expected: FAIL
 
-  [outline-offset length(cm) / events]
+  [border-right-width length(pc) / values]
     expected: FAIL
 
-  [vertical-align length(mm) / events]
+  [border-right-width length(px) / values]
     expected: FAIL
 
-  [outline-offset length(em) / events]
+  [border-right-width length(em) / values]
     expected: FAIL
 
-  [vertical-align length(ex) / events]
+  [border-right-width length(ex) / values]
     expected: FAIL
 
-  [outline-width length(em) / events]
+  [border-right-width length(mm) / values]
     expected: FAIL
 
-  [text-indent length(in) / events]
+  [border-right-width length(cm) / values]
     expected: FAIL
 
-  [text-indent length(pc) / events]
+  [border-right-width length(in) / values]
     expected: FAIL
 
-  [text-indent length(em) / events]
+  [border-bottom-width length(pt) / values]
     expected: FAIL
 
-  [text-indent length(px) / events]
+  [border-bottom-width length(pc) / values]
     expected: FAIL
 
-  [text-indent length(cm) / events]
+  [border-bottom-width length(px) / values]
     expected: FAIL
 
-  [outline-width length(cm) / events]
+  [border-bottom-width length(em) / values]
     expected: FAIL
 
-  [text-indent length(pt) / events]
+  [border-bottom-width length(ex) / values]
     expected: FAIL
 
-  [outline-width length(ex) / events]
+  [border-bottom-width length(mm) / values]
     expected: FAIL
 
-  [outline-width length(mm) / events]
+  [border-bottom-width length(cm) / values]
     expected: FAIL
 
-  [vertical-align percentage(%) / events]
+  [border-bottom-width length(in) / values]
     expected: FAIL
 
-  [outline-width length(pt) / events]
+  [border-left-width length(pt) / values]
     expected: FAIL
 
-  [outline-color color(rgba) / events]
+  [border-left-width length(pc) / values]
     expected: FAIL
 
-  [outline-width length(in) / events]
+  [border-left-width length(px) / values]
     expected: FAIL
 
-  [outline-offset length(ex) / events]
+  [border-left-width length(em) / values]
     expected: FAIL
 
-  [vertical-align length(pc) / events]
+  [border-left-width length(ex) / values]
     expected: FAIL
 
-  [vertical-align length(pt) / events]
+  [border-left-width length(mm) / values]
     expected: FAIL
 
-  [outline-offset length(pt) / events]
+  [border-left-width length(cm) / values]
     expected: FAIL
 
-  [outline-offset length(px) / events]
+  [border-left-width length(in) / values]
     expected: FAIL
 
-  [outline-offset length(in) / events]
+  [border-top-color color(rgba) / values]
     expected: FAIL
 
-  [outline-width length(px) / events]
+  [border-right-color color(rgba) / values]
     expected: FAIL
 
-  [outline-offset length(pc) / events]
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [padding-bottom length(ex) / values]
+    expected: FAIL
+
+  [padding-bottom length(mm) / values]
+    expected: FAIL
+
+  [padding-bottom length(cm) / values]
+    expected: FAIL
+
+  [padding-bottom length(in) / values]
+    expected: FAIL
+
+  [padding-left length(pt) / values]
+    expected: FAIL
+
+  [padding-left length(pc) / values]
+    expected: FAIL
+
+  [padding-left length(px) / values]
+    expected: FAIL
+
+  [padding-left length(em) / values]
+    expected: FAIL
+
+  [padding-left length(ex) / values]
+    expected: FAIL
+
+  [padding-left length(mm) / values]
+    expected: FAIL
+
+  [padding-left length(cm) / values]
+    expected: FAIL
+
+  [padding-left length(in) / values]
+    expected: FAIL
+
+  [padding-right length(pt) / values]
+    expected: FAIL
+
+  [padding-right length(pc) / values]
+    expected: FAIL
+
+  [padding-right length(px) / values]
+    expected: FAIL
+
+  [padding-right length(em) / values]
+    expected: FAIL
+
+  [padding-right length(ex) / values]
+    expected: FAIL
+
+  [padding-right length(mm) / values]
+    expected: FAIL
+
+  [padding-right length(cm) / values]
+    expected: FAIL
+
+  [padding-right length(in) / values]
+    expected: FAIL
+
+  [padding-top length(pt) / values]
+    expected: FAIL
+
+  [padding-top length(pc) / values]
+    expected: FAIL
+
+  [padding-top length(px) / values]
+    expected: FAIL
+
+  [padding-top length(em) / values]
+    expected: FAIL
+
+  [padding-top length(ex) / values]
+    expected: FAIL
+
+  [padding-top length(mm) / values]
+    expected: FAIL
+
+  [padding-top length(cm) / values]
+    expected: FAIL
+
+  [padding-top length(in) / values]
+    expected: FAIL
+
+  [margin-bottom length(pt) / values]
+    expected: FAIL
+
+  [margin-bottom length(pc) / values]
+    expected: FAIL
+
+  [margin-bottom length(px) / values]
+    expected: FAIL
+
+  [margin-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-bottom length(ex) / values]
+    expected: FAIL
+
+  [margin-bottom length(mm) / values]
+    expected: FAIL
+
+  [margin-bottom length(cm) / values]
+    expected: FAIL
+
+  [margin-bottom length(in) / values]
+    expected: FAIL
+
+  [margin-left length(pt) / values]
+    expected: FAIL
+
+  [margin-left length(pc) / values]
+    expected: FAIL
+
+  [margin-left length(px) / values]
+    expected: FAIL
+
+  [margin-left length(em) / values]
+    expected: FAIL
+
+  [margin-left length(ex) / values]
+    expected: FAIL
+
+  [margin-left length(mm) / values]
+    expected: FAIL
+
+  [margin-left length(cm) / values]
+    expected: FAIL
+
+  [margin-left length(in) / values]
+    expected: FAIL
+
+  [margin-right length(pt) / values]
+    expected: FAIL
+
+  [margin-right length(pc) / values]
+    expected: FAIL
+
+  [margin-right length(px) / values]
+    expected: FAIL
+
+  [margin-right length(em) / values]
+    expected: FAIL
+
+  [margin-right length(ex) / values]
+    expected: FAIL
+
+  [margin-right length(mm) / values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-implicit-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-implicit-001.html.ini
index 6b927bd47c0..e8d7848fdbd 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-implicit-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-implicit-001.html.ini
@@ -1,31 +1,7 @@
 [properties-value-implicit-001.html]
-  [text-indent length-em(em) / events]
-    expected: FAIL
-
-  [vertical-align length-em(em) / values]
-    expected: FAIL
-
   [background-position length-em(em) / events]
     expected: FAIL
 
-  [outline-width length-em(em) / values]
-    expected: FAIL
-
-  [outline-offset length-em(em) / events]
-    expected: FAIL
-
   [background-position length-em(em) / values]
     expected: FAIL
 
-  [outline-width length-em(em) / events]
-    expected: FAIL
-
-  [text-indent length-em(em) / values]
-    expected: FAIL
-
-  [outline-offset length-em(em) / values]
-    expected: FAIL
-
-  [vertical-align length-em(em) / events]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
index f330fa6628a..3a807df2b3e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
@@ -1,31 +1,13 @@
 [properties-value-inherit-001.html]
-  [outline-width length(px) / values]
-    expected: FAIL
-
   [background-position length(pt) / values]
     expected: FAIL
 
   [background-position length(pt) / events]
     expected: FAIL
 
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [outline-offset length(px) / values]
-    expected: FAIL
-
-  [vertical-align length(in) / values]
-    expected: FAIL
-
-  [outline-width length(pc) / events]
-    expected: FAIL
-
   [text-indent percentage(%) / events]
     expected: FAIL
 
-  [vertical-align length(px) / events]
-    expected: FAIL
-
   [background-position length(px) / values]
     expected: FAIL
 
@@ -38,237 +20,612 @@
   [background-position length(mm) / values]
     expected: FAIL
 
-  [outline-offset length(mm) / events]
-    expected: FAIL
-
-  [vertical-align length(in) / events]
-    expected: FAIL
-
-  [vertical-align percentage(%) / values]
-    expected: FAIL
-
   [background-position length(in) / events]
     expected: FAIL
 
-  [text-indent length(ex) / values]
-    expected: FAIL
-
   [text-indent length(mm) / events]
     expected: FAIL
 
-  [vertical-align length(em) / events]
-    expected: FAIL
-
-  [vertical-align length(em) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [vertical-align length(cm) / events]
-    expected: FAIL
-
   [text-indent length(ex) / events]
     expected: FAIL
 
-  [outline-offset length(cm) / events]
-    expected: FAIL
-
   [background-position length(em) / events]
     expected: FAIL
 
-  [vertical-align length(mm) / events]
-    expected: FAIL
-
-  [outline-offset length(em) / events]
-    expected: FAIL
-
-  [vertical-align length(ex) / events]
-    expected: FAIL
-
-  [outline-width length(em) / events]
-    expected: FAIL
-
   [text-indent length(in) / events]
     expected: FAIL
 
-  [outline-offset length(ex) / values]
-    expected: FAIL
-
-  [vertical-align length(pc) / values]
-    expected: FAIL
-
-  [vertical-align length(cm) / values]
-    expected: FAIL
-
-  [vertical-align length(ex) / values]
-    expected: FAIL
-
   [text-indent length(pc) / events]
     expected: FAIL
 
   [text-indent length(em) / events]
     expected: FAIL
 
-  [outline-offset length(mm) / values]
-    expected: FAIL
-
-  [outline-offset length(pt) / values]
-    expected: FAIL
-
   [text-indent length(px) / events]
     expected: FAIL
 
   [text-indent length(cm) / events]
     expected: FAIL
 
-  [vertical-align length(pt) / values]
-    expected: FAIL
-
   [visibility visibility(keyword) / values]
     expected: FAIL
 
-  [outline-width length(cm) / events]
-    expected: FAIL
-
   [background-position length(ex) / values]
     expected: FAIL
 
-  [text-indent length(mm) / values]
-    expected: FAIL
-
   [background-position length(cm) / values]
     expected: FAIL
 
   [text-indent length(pt) / events]
     expected: FAIL
 
-  [outline-offset length(in) / values]
-    expected: FAIL
-
-  [outline-width length(pt) / values]
-    expected: FAIL
-
-  [outline-width length(ex) / events]
-    expected: FAIL
-
-  [outline-width length(mm) / events]
-    expected: FAIL
-
-  [outline-width length(in) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [outline-color color(rgba) / values]
-    expected: FAIL
-
   [background-position length(ex) / events]
     expected: FAIL
 
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [vertical-align percentage(%) / events]
-    expected: FAIL
-
-  [outline-width length(pt) / events]
-    expected: FAIL
-
-  [outline-color color(rgba) / events]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
   [background-position length(pc) / events]
     expected: FAIL
 
-  [outline-width length(in) / events]
-    expected: FAIL
-
-  [outline-width length(ex) / values]
-    expected: FAIL
-
   [background-position length(in) / values]
     expected: FAIL
 
-  [outline-width length(cm) / values]
-    expected: FAIL
-
-  [outline-offset length(ex) / events]
-    expected: FAIL
-
-  [outline-width length(mm) / values]
-    expected: FAIL
-
-  [outline-width length(pc) / values]
-    expected: FAIL
-
-  [vertical-align length(px) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [vertical-align length(pc) / events]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
   [background-position length(pc) / values]
     expected: FAIL
 
   [background-position percentage(%) / values]
     expected: FAIL
 
-  [vertical-align length(pt) / events]
-    expected: FAIL
-
-  [outline-width length(em) / values]
-    expected: FAIL
-
-  [outline-offset length(em) / values]
-    expected: FAIL
-
-  [outline-offset length(pt) / events]
-    expected: FAIL
-
-  [outline-offset length(cm) / values]
-    expected: FAIL
-
   [background-position length(mm) / events]
     expected: FAIL
 
-  [vertical-align length(mm) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [outline-offset length(px) / events]
-    expected: FAIL
-
   [background-position length(em) / values]
     expected: FAIL
 
-  [outline-offset length(in) / events]
-    expected: FAIL
-
-  [outline-offset length(pc) / values]
-    expected: FAIL
-
-  [outline-width length(px) / events]
-    expected: FAIL
-
   [background-position percentage(%) / events]
     expected: FAIL
 
   [background-position length(px) / events]
     expected: FAIL
 
-  [outline-offset length(pc) / events]
+  [background-color color(rgba) / events]
+    expected: FAIL
+
+  [border-top-width length(pt) / events]
+    expected: FAIL
+
+  [border-top-width length(pc) / events]
+    expected: FAIL
+
+  [border-top-width length(px) / events]
+    expected: FAIL
+
+  [border-top-width length(em) / events]
+    expected: FAIL
+
+  [border-top-width length(ex) / events]
+    expected: FAIL
+
+  [border-top-width length(mm) / events]
+    expected: FAIL
+
+  [border-top-width length(cm) / events]
+    expected: FAIL
+
+  [border-top-width length(in) / events]
+    expected: FAIL
+
+  [border-right-width length(pt) / events]
+    expected: FAIL
+
+  [border-right-width length(pc) / events]
+    expected: FAIL
+
+  [border-right-width length(px) / events]
+    expected: FAIL
+
+  [border-right-width length(em) / events]
+    expected: FAIL
+
+  [border-right-width length(ex) / events]
+    expected: FAIL
+
+  [border-right-width length(mm) / events]
+    expected: FAIL
+
+  [border-right-width length(cm) / events]
+    expected: FAIL
+
+  [border-right-width length(in) / events]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / events]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / events]
+    expected: FAIL
+
+  [border-bottom-width length(px) / events]
+    expected: FAIL
+
+  [border-bottom-width length(em) / events]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / events]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / events]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / events]
+    expected: FAIL
+
+  [border-bottom-width length(in) / events]
+    expected: FAIL
+
+  [border-left-width length(pt) / events]
+    expected: FAIL
+
+  [border-left-width length(pc) / events]
+    expected: FAIL
+
+  [border-left-width length(px) / events]
+    expected: FAIL
+
+  [border-left-width length(em) / events]
+    expected: FAIL
+
+  [border-left-width length(ex) / events]
+    expected: FAIL
+
+  [border-left-width length(mm) / events]
+    expected: FAIL
+
+  [border-left-width length(cm) / events]
+    expected: FAIL
+
+  [border-left-width length(in) / events]
+    expected: FAIL
+
+  [border-top-color color(rgba) / events]
+    expected: FAIL
+
+  [border-right-color color(rgba) / events]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / events]
+    expected: FAIL
+
+  [border-left-color color(rgba) / events]
+    expected: FAIL
+
+  [padding-bottom length(pt) / events]
+    expected: FAIL
+
+  [padding-bottom length(pc) / events]
+    expected: FAIL
+
+  [padding-bottom length(px) / events]
+    expected: FAIL
+
+  [padding-bottom length(em) / events]
+    expected: FAIL
+
+  [padding-bottom length(ex) / events]
+    expected: FAIL
+
+  [padding-bottom length(mm) / events]
+    expected: FAIL
+
+  [padding-bottom length(cm) / events]
+    expected: FAIL
+
+  [padding-bottom length(in) / events]
+    expected: FAIL
+
+  [padding-left length(pt) / events]
+    expected: FAIL
+
+  [padding-left length(pc) / events]
+    expected: FAIL
+
+  [padding-left length(px) / events]
+    expected: FAIL
+
+  [padding-left length(em) / events]
+    expected: FAIL
+
+  [padding-left length(ex) / events]
+    expected: FAIL
+
+  [padding-left length(mm) / events]
+    expected: FAIL
+
+  [padding-left length(cm) / events]
+    expected: FAIL
+
+  [padding-left length(in) / events]
+    expected: FAIL
+
+  [padding-right length(pt) / events]
+    expected: FAIL
+
+  [padding-right length(pc) / events]
+    expected: FAIL
+
+  [padding-right length(px) / events]
+    expected: FAIL
+
+  [padding-right length(em) / events]
+    expected: FAIL
+
+  [padding-right length(ex) / events]
+    expected: FAIL
+
+  [padding-right length(mm) / events]
+    expected: FAIL
+
+  [padding-right length(cm) / events]
+    expected: FAIL
+
+  [padding-right length(in) / events]
+    expected: FAIL
+
+  [padding-top length(pt) / events]
+    expected: FAIL
+
+  [padding-top length(pc) / events]
+    expected: FAIL
+
+  [padding-top length(px) / events]
+    expected: FAIL
+
+  [padding-top length(em) / events]
+    expected: FAIL
+
+  [padding-top length(ex) / events]
+    expected: FAIL
+
+  [padding-top length(mm) / events]
+    expected: FAIL
+
+  [padding-top length(cm) / events]
+    expected: FAIL
+
+  [padding-top length(in) / events]
+    expected: FAIL
+
+  [margin-bottom length(pt) / events]
+    expected: FAIL
+
+  [margin-bottom length(pc) / events]
+    expected: FAIL
+
+  [margin-bottom length(px) / events]
+    expected: FAIL
+
+  [margin-bottom length(em) / events]
+    expected: FAIL
+
+  [margin-bottom length(ex) / events]
+    expected: FAIL
+
+  [margin-bottom length(mm) / events]
+    expected: FAIL
+
+  [margin-bottom length(cm) / events]
+    expected: FAIL
+
+  [margin-bottom length(in) / events]
+    expected: FAIL
+
+  [margin-left length(pt) / events]
+    expected: FAIL
+
+  [margin-left length(pc) / events]
+    expected: FAIL
+
+  [margin-left length(px) / events]
+    expected: FAIL
+
+  [margin-left length(em) / events]
+    expected: FAIL
+
+  [margin-left length(ex) / events]
+    expected: FAIL
+
+  [margin-left length(mm) / events]
+    expected: FAIL
+
+  [margin-left length(cm) / events]
+    expected: FAIL
+
+  [margin-left length(in) / events]
+    expected: FAIL
+
+  [margin-right length(pt) / events]
+    expected: FAIL
+
+  [margin-right length(pc) / events]
+    expected: FAIL
+
+  [margin-right length(px) / events]
+    expected: FAIL
+
+  [margin-right length(em) / events]
+    expected: FAIL
+
+  [margin-right length(ex) / events]
+    expected: FAIL
+
+  [margin-right length(mm) / events]
+    expected: FAIL
+
+  [max-height length(ex) / events]
+    expected: FAIL
+
+  [max-height length(mm) / events]
+    expected: FAIL
+
+  [max-height length(cm) / events]
+    expected: FAIL
+
+  [max-height length(in) / events]
+    expected: FAIL
+
+  [max-height percentage(%) / events]
+    expected: FAIL
+
+  [max-width length(pt) / events]
+    expected: FAIL
+
+  [max-width length(pc) / events]
+    expected: FAIL
+
+  [max-width length(px) / events]
+    expected: FAIL
+
+  [max-width length(em) / events]
+    expected: FAIL
+
+  [max-width length(ex) / events]
+    expected: FAIL
+
+  [max-width length(mm) / events]
+    expected: FAIL
+
+  [max-width length(cm) / events]
+    expected: FAIL
+
+  [max-width length(in) / events]
+    expected: FAIL
+
+  [max-width percentage(%) / events]
+    expected: FAIL
+
+  [top length(pt) / events]
+    expected: FAIL
+
+  [top length(pc) / events]
+    expected: FAIL
+
+  [top length(px) / events]
+    expected: FAIL
+
+  [top length(em) / events]
+    expected: FAIL
+
+  [top length(ex) / events]
+    expected: FAIL
+
+  [top length(mm) / events]
+    expected: FAIL
+
+  [top length(cm) / events]
+    expected: FAIL
+
+  [top length(in) / events]
+    expected: FAIL
+
+  [top percentage(%) / events]
+    expected: FAIL
+
+  [right length(pt) / events]
+    expected: FAIL
+
+  [right length(pc) / events]
+    expected: FAIL
+
+  [right length(px) / events]
+    expected: FAIL
+
+  [right length(em) / events]
+    expected: FAIL
+
+  [right length(ex) / events]
+    expected: FAIL
+
+  [right length(mm) / events]
+    expected: FAIL
+
+  [right length(cm) / events]
+    expected: FAIL
+
+  [right length(in) / events]
+    expected: FAIL
+
+  [right percentage(%) / events]
+    expected: FAIL
+
+  [bottom length(pt) / events]
+    expected: FAIL
+
+  [bottom length(pc) / events]
+    expected: FAIL
+
+  [bottom length(px) / events]
+    expected: FAIL
+
+  [bottom length(em) / events]
+    expected: FAIL
+
+  [bottom length(ex) / events]
+    expected: FAIL
+
+  [bottom length(mm) / events]
+    expected: FAIL
+
+  [bottom length(cm) / events]
+    expected: FAIL
+
+  [bottom length(in) / events]
+    expected: FAIL
+
+  [bottom percentage(%) / events]
+    expected: FAIL
+
+  [left length(pt) / events]
+    expected: FAIL
+
+  [left length(pc) / events]
+    expected: FAIL
+
+  [left length(px) / events]
+    expected: FAIL
+
+  [left length(em) / events]
+    expected: FAIL
+
+  [left length(ex) / events]
+    expected: FAIL
+
+  [left length(mm) / events]
+    expected: FAIL
+
+  [left length(cm) / events]
+    expected: FAIL
+
+  [left length(in) / events]
+    expected: FAIL
+
+  [left percentage(%) / events]
+    expected: FAIL
+
+  [color color(rgba) / events]
+    expected: FAIL
+
+  [font-size length(pt) / events]
+    expected: FAIL
+
+  [font-size length(pc) / events]
+    expected: FAIL
+
+  [font-size length(px) / events]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
+  [font-size length(ex) / events]
+    expected: FAIL
+
+  [font-size length(mm) / events]
+    expected: FAIL
+
+  [font-size length(cm) / events]
+    expected: FAIL
+
+  [font-size length(in) / events]
+    expected: FAIL
+
+  [font-size percentage(%) / events]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / events]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / events]
+    expected: FAIL
+
+  [line-height number(integer) / events]
+    expected: FAIL
+
+  [line-height number(decimal) / events]
+    expected: FAIL
+
+  [line-height length(pt) / events]
+    expected: FAIL
+
+  [line-height length(pc) / events]
+    expected: FAIL
+
+  [line-height length(px) / events]
+    expected: FAIL
+
+  [line-height length(em) / events]
+    expected: FAIL
+
+  [line-height length(ex) / events]
+    expected: FAIL
+
+  [line-height length(mm) / events]
+    expected: FAIL
+
+  [line-height length(cm) / events]
+    expected: FAIL
+
+  [line-height length(in) / events]
+    expected: FAIL
+
+  [line-height percentage(%) / events]
+    expected: FAIL
+
+  [letter-spacing length(pt) / events]
+    expected: FAIL
+
+  [letter-spacing length(pc) / events]
+    expected: FAIL
+
+  [letter-spacing length(px) / events]
+    expected: FAIL
+
+  [letter-spacing length(em) / events]
+    expected: FAIL
+
+  [letter-spacing length(ex) / events]
+    expected: FAIL
+
+  [letter-spacing length(mm) / events]
+    expected: FAIL
+
+  [letter-spacing length(cm) / events]
+    expected: FAIL
+
+  [letter-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing length(pt) / events]
+    expected: FAIL
+
+  [word-spacing length(pc) / events]
+    expected: FAIL
+
+  [word-spacing length(px) / events]
+    expected: FAIL
+
+  [word-spacing length(em) / events]
+    expected: FAIL
+
+  [word-spacing length(ex) / events]
+    expected: FAIL
+
+  [word-spacing length(mm) / events]
+    expected: FAIL
+
+  [word-spacing length(cm) / events]
+    expected: FAIL
+
+  [word-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing percentage(%) / events]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
index 4b24cc91bb3..492f1b2bd2e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
@@ -1,22 +1,10 @@
 [properties-value-inherit-002.html]
-  [outline-width length(px) / values]
-    expected: FAIL
-
   [background-position length(pt) / values]
     expected: FAIL
 
   [background-position length(pt) / events]
     expected: FAIL
 
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [outline-offset length(px) / values]
-    expected: FAIL
-
-  [vertical-align length(in) / values]
-    expected: FAIL
-
   [background-position length(px) / values]
     expected: FAIL
 
@@ -26,246 +14,315 @@
   [background-position length(mm) / values]
     expected: FAIL
 
-  [vertical-align percentage(%) / values]
-    expected: FAIL
-
   [background-position length(in) / events]
     expected: FAIL
 
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [vertical-align length(em) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
   [background-position length(em) / events]
     expected: FAIL
 
-  [outline-offset length(ex) / values]
-    expected: FAIL
-
-  [vertical-align length(pc) / values]
-    expected: FAIL
-
-  [vertical-align length(cm) / values]
-    expected: FAIL
-
-  [vertical-align length(ex) / values]
-    expected: FAIL
-
-  [outline-offset length(mm) / values]
-    expected: FAIL
-
-  [outline-offset length(pt) / values]
-    expected: FAIL
-
-  [vertical-align length(pt) / values]
-    expected: FAIL
-
   [background-position length(ex) / values]
     expected: FAIL
 
-  [text-indent length(mm) / values]
-    expected: FAIL
-
   [background-position length(cm) / values]
     expected: FAIL
 
-  [outline-offset length(in) / values]
-    expected: FAIL
-
-  [outline-width length(pt) / values]
-    expected: FAIL
-
-  [outline-width length(in) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [outline-color color(rgba) / values]
-    expected: FAIL
-
   [background-position length(ex) / events]
     expected: FAIL
 
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
   [background-position length(pc) / events]
     expected: FAIL
 
-  [outline-width length(ex) / values]
-    expected: FAIL
-
   [background-position length(in) / values]
     expected: FAIL
 
-  [outline-width length(cm) / values]
-    expected: FAIL
-
-  [outline-width length(mm) / values]
-    expected: FAIL
-
-  [outline-width length(pc) / values]
-    expected: FAIL
-
-  [vertical-align length(px) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
   [background-position length(pc) / values]
     expected: FAIL
 
   [background-position percentage(%) / values]
     expected: FAIL
 
-  [outline-width length(em) / values]
-    expected: FAIL
-
-  [outline-offset length(em) / values]
-    expected: FAIL
-
-  [outline-offset length(cm) / values]
-    expected: FAIL
-
   [background-position length(mm) / events]
     expected: FAIL
 
-  [vertical-align length(mm) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
   [background-position length(em) / values]
     expected: FAIL
 
-  [outline-offset length(pc) / values]
-    expected: FAIL
-
   [background-position percentage(%) / events]
     expected: FAIL
 
   [background-position length(px) / events]
     expected: FAIL
 
-  [outline-width length(pc) / events]
+  [background-color color(rgba) / values]
     expected: FAIL
 
-  [text-indent percentage(%) / events]
+  [border-top-width length(pt) / values]
     expected: FAIL
 
-  [vertical-align length(px) / events]
+  [border-top-width length(pc) / values]
     expected: FAIL
 
-  [text-shadow shadow(shadow) / events]
+  [border-top-width length(px) / values]
     expected: FAIL
 
-  [outline-offset length(mm) / events]
+  [border-top-width length(em) / values]
     expected: FAIL
 
-  [vertical-align length(in) / events]
+  [border-top-width length(ex) / values]
     expected: FAIL
 
-  [text-indent length(mm) / events]
+  [border-top-width length(mm) / values]
     expected: FAIL
 
-  [vertical-align length(em) / events]
+  [border-top-width length(cm) / values]
     expected: FAIL
 
-  [vertical-align length(cm) / events]
+  [border-top-width length(in) / values]
     expected: FAIL
 
-  [text-indent length(ex) / events]
+  [border-right-width length(pt) / values]
     expected: FAIL
 
-  [outline-offset length(cm) / events]
+  [border-right-width length(pc) / values]
     expected: FAIL
 
-  [vertical-align length(mm) / events]
+  [border-right-width length(px) / values]
     expected: FAIL
 
-  [outline-offset length(em) / events]
+  [border-right-width length(em) / values]
     expected: FAIL
 
-  [vertical-align length(ex) / events]
+  [border-right-width length(ex) / values]
     expected: FAIL
 
-  [outline-width length(em) / events]
+  [border-right-width length(mm) / values]
     expected: FAIL
 
-  [text-indent length(in) / events]
+  [border-right-width length(cm) / values]
     expected: FAIL
 
-  [text-indent length(pc) / events]
+  [border-right-width length(in) / values]
     expected: FAIL
 
-  [text-indent length(em) / events]
+  [border-bottom-width length(pt) / values]
     expected: FAIL
 
-  [text-indent length(px) / events]
+  [border-bottom-width length(pc) / values]
     expected: FAIL
 
-  [text-indent length(cm) / events]
+  [border-bottom-width length(px) / values]
     expected: FAIL
 
-  [outline-width length(cm) / events]
+  [border-bottom-width length(em) / values]
     expected: FAIL
 
-  [text-indent length(pt) / events]
+  [border-bottom-width length(ex) / values]
     expected: FAIL
 
-  [outline-width length(ex) / events]
+  [border-bottom-width length(mm) / values]
     expected: FAIL
 
-  [outline-width length(mm) / events]
+  [border-bottom-width length(cm) / values]
     expected: FAIL
 
-  [vertical-align percentage(%) / events]
+  [border-bottom-width length(in) / values]
     expected: FAIL
 
-  [outline-width length(pt) / events]
+  [border-left-width length(pt) / values]
     expected: FAIL
 
-  [outline-color color(rgba) / events]
+  [border-left-width length(pc) / values]
     expected: FAIL
 
-  [outline-width length(in) / events]
+  [border-left-width length(px) / values]
     expected: FAIL
 
-  [outline-offset length(ex) / events]
+  [border-left-width length(em) / values]
     expected: FAIL
 
-  [vertical-align length(pc) / events]
+  [border-left-width length(ex) / values]
     expected: FAIL
 
-  [vertical-align length(pt) / events]
+  [border-left-width length(mm) / values]
     expected: FAIL
 
-  [outline-offset length(pt) / events]
+  [border-left-width length(cm) / values]
     expected: FAIL
 
-  [outline-offset length(px) / events]
+  [border-left-width length(in) / values]
     expected: FAIL
 
-  [outline-offset length(in) / events]
+  [border-top-color color(rgba) / values]
     expected: FAIL
 
-  [outline-width length(px) / events]
+  [border-right-color color(rgba) / values]
     expected: FAIL
 
-  [outline-offset length(pc) / events]
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [padding-bottom length(ex) / values]
+    expected: FAIL
+
+  [padding-bottom length(mm) / values]
+    expected: FAIL
+
+  [padding-bottom length(cm) / values]
+    expected: FAIL
+
+  [padding-bottom length(in) / values]
+    expected: FAIL
+
+  [padding-left length(pt) / values]
+    expected: FAIL
+
+  [padding-left length(pc) / values]
+    expected: FAIL
+
+  [padding-left length(px) / values]
+    expected: FAIL
+
+  [padding-left length(em) / values]
+    expected: FAIL
+
+  [padding-left length(ex) / values]
+    expected: FAIL
+
+  [padding-left length(mm) / values]
+    expected: FAIL
+
+  [padding-left length(cm) / values]
+    expected: FAIL
+
+  [padding-left length(in) / values]
+    expected: FAIL
+
+  [padding-right length(pt) / values]
+    expected: FAIL
+
+  [padding-right length(pc) / values]
+    expected: FAIL
+
+  [padding-right length(px) / values]
+    expected: FAIL
+
+  [padding-right length(em) / values]
+    expected: FAIL
+
+  [padding-right length(ex) / values]
+    expected: FAIL
+
+  [padding-right length(mm) / values]
+    expected: FAIL
+
+  [padding-right length(cm) / values]
+    expected: FAIL
+
+  [padding-right length(in) / values]
+    expected: FAIL
+
+  [padding-top length(pt) / values]
+    expected: FAIL
+
+  [padding-top length(pc) / values]
+    expected: FAIL
+
+  [padding-top length(px) / values]
+    expected: FAIL
+
+  [padding-top length(em) / values]
+    expected: FAIL
+
+  [padding-top length(ex) / values]
+    expected: FAIL
+
+  [padding-top length(mm) / values]
+    expected: FAIL
+
+  [padding-top length(cm) / values]
+    expected: FAIL
+
+  [padding-top length(in) / values]
+    expected: FAIL
+
+  [margin-bottom length(pt) / values]
+    expected: FAIL
+
+  [margin-bottom length(pc) / values]
+    expected: FAIL
+
+  [margin-bottom length(px) / values]
+    expected: FAIL
+
+  [margin-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-bottom length(ex) / values]
+    expected: FAIL
+
+  [margin-bottom length(mm) / values]
+    expected: FAIL
+
+  [margin-bottom length(cm) / values]
+    expected: FAIL
+
+  [margin-bottom length(in) / values]
+    expected: FAIL
+
+  [margin-left length(pt) / values]
+    expected: FAIL
+
+  [margin-left length(pc) / values]
+    expected: FAIL
+
+  [margin-left length(px) / values]
+    expected: FAIL
+
+  [margin-left length(em) / values]
+    expected: FAIL
+
+  [margin-left length(ex) / values]
+    expected: FAIL
+
+  [margin-left length(mm) / values]
+    expected: FAIL
+
+  [margin-left length(cm) / values]
+    expected: FAIL
+
+  [margin-left length(in) / values]
+    expected: FAIL
+
+  [margin-right length(pt) / values]
+    expected: FAIL
+
+  [margin-right length(pc) / values]
+    expected: FAIL
+
+  [margin-right length(px) / values]
+    expected: FAIL
+
+  [margin-right length(em) / values]
+    expected: FAIL
+
+  [margin-right length(ex) / values]
+    expected: FAIL
+
+  [margin-right length(mm) / values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..25e4ef49e32 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -1,7 +1,4 @@
 [elementsFromPoint-iframes.html]
-  [elementsFromPoint on the root document for points in iframe elements]
-    expected: FAIL
-
   [elementsFromPoint on inner documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index aa18bf54293..ae4c5ed2c36 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,18 +309,24 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: separate response Content-Type: text/plain */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index e67f0406fc3..5c001592859 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,3 +53,9 @@
   [combined text/javascript ]
     expected: FAIL
 
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index dc2e45516de..385376c7321 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_4.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..16fa2c5cfc1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,4 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index f29162631b3..9a85a905394 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,8 +1,7 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d81ae5a4949..3538891dae8 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,14 +4,14 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
-
-  [Host element with delegatesFocus should support autofocus]
     expected: TIMEOUT
 
+  [Host element with delegatesFocus should support autofocus]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 295031c1812..338d283eb0e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 0407f0cc2b7..9eb581fcf1f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini
new file mode 100644
index 00000000000..9b881e45728
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini
@@ -0,0 +1,22 @@
+[parse-a-sizes-attribute-display-none.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (display:none)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
new file mode 100644
index 00000000000..33b481e8f48
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
@@ -0,0 +1,22 @@
+[parse-a-sizes-attribute-quirks-mode.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
new file mode 100644
index 00000000000..306be4247f3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
@@ -0,0 +1,22 @@
+[parse-a-sizes-attribute-standards-mode.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (standards mode)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
new file mode 100644
index 00000000000..464a3bbdd97
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
@@ -0,0 +1,22 @@
+[parse-a-sizes-attribute-width-1000px.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (width:1000px)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 1f889a84dea..9370521a51a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,28 +1,10 @@
 [select-event.html]
-  [input type text: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -35,42 +17,69 @@
   [input type text: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
+  [textarea: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
+  [textarea: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 23fb39e544c..b1aa0f1f1c4 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,14 +1,13 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
index 9d262275083..d7071b6bcee 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,3 +2,6 @@
   [test_element_in_object]
     expected: FAIL
 
+  [test_element_in_collection]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 650c91da4a6..333edb3a26e 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,5 +1,4 @@
 [sharedworker-in-worker.html]
-  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 31e40e68d60..1eb02e22a15 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -280,6 +280,13 @@
      ]
     },
     "css-layout-api": {
+     "input-text-crash.https.html": [
+      "2d32609040a970fa0b20ec6f0530b91c53a360d4",
+      [
+       null,
+       {}
+      ]
+     ],
      "inside-multicol-crash.https.html": [
       "61223bfcdccfaa965d684e287da71bee00664fc4",
       [
@@ -21309,15 +21316,6 @@
      }
     }
    },
-   "touch-events": {
-    "multi-touch-interactions-manual.html": [
-     "45e53af0ee97c0e29826002701083c21d50ce989",
-     [
-      null,
-      {}
-     ]
-    ]
-   },
    "uievents": {
     "interface": {
      "click-event-manual.htm": [
@@ -120852,6 +120850,19 @@
         ],
         {}
        ]
+      ],
+      "two-animation-diff-length.html": [
+       "4faffd0425cf704313b8e5052b06839efb1a9404",
+       [
+        null,
+        [
+         [
+          "/css/css-backgrounds/animations/two-animation-diff-length-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "background-334.html": [
@@ -128131,6 +128142,19 @@
        {}
       ]
      ],
+     "monolithic-with-overflow.html": [
+      "93bc149ec1fb54ba167dd16a33a0ca5c7506306d",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "out-of-flow-in-multicolumn-001.html": [
       "0322f5171014e162ee0870574166e78624602fab",
       [
@@ -143396,84 +143420,6 @@
        {}
       ]
      ],
-     "css-flexbox-column-reverse-wrap-reverse.html": [
-      "d4787bca4554a71fbf7ade2902c33abca24f0cd5",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/css-flexbox-column-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "css-flexbox-column-reverse-wrap.html": [
-      "05c4c7f54cf95be4d540e362c19568214c36b717",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/css-flexbox-column-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "css-flexbox-column-reverse.html": [
-      "9115ae35236909bbaf81b61f26c70a0be2578267",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/css-flexbox-column-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "css-flexbox-column-wrap-reverse.html": [
-      "ec309ba80974f78b4bf9981dfeda4375df7ada13",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/css-flexbox-column-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "css-flexbox-column-wrap.html": [
-      "c4797a9d7d59fc126cd819f6251d577e39696a40",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/css-flexbox-column-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "css-flexbox-column.html": [
-      "c633a443f569847149f6f6d3d3db64dd0fd75574",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/css-flexbox-column-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "css-flexbox-img-expand-evenly.html": [
       "8e8c1d856a193e8449413dee0dfc936c47c598e8",
       [
@@ -152318,6 +152264,58 @@
        {}
       ]
      ],
+     "table-as-item-inflexible-in-column-1.html": [
+      "201a97fb4521bb05cfd148733132208c85e3404e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-as-item-inflexible-in-column-2.html": [
+      "74c7b0324d2e99dab1585b908e835a8311907d50",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-as-item-inflexible-in-row-1.html": [
+      "073e7f7274ab7b3b52252d1d1b7301816c7dbf5e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "table-as-item-inflexible-in-row-2.html": [
+      "f01e09136598f76ce7a1e2a237dadeba1e2d1e1b",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "table-as-item-narrow-content-2.html": [
       "96af10770f2de07a9adae7603eaa0cd0ebad0121",
       [
@@ -152396,6 +152394,19 @@
        {}
       ]
      ],
+     "table-as-item-stretch-cross-size-3.html": [
+      "04e168e52ebdfe1631edb786bc6134a2d8a2e0e0",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "table-as-item-stretch-cross-size.html": [
       "06d685be8b4ad3ab84790d62b60fcf7abf19042b",
       [
@@ -155328,6 +155339,19 @@
         {}
        ]
       ],
+      "grid-positioned-item-dynamic-change-002.html": [
+       "2728e024ee240d749b01b8aee1b0adb66307bd24",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-positioned-items-background-001.html": [
        "f5e49fbffe574e9e16cfd12dedb643b02c5f28dd",
        [
@@ -286729,16 +286753,6 @@
      []
     ]
    },
-   "cors-rfc1918": {
-    "META.yml": [
-     "7f0d420a0e6f040497827a1cf19cb7b39d55922a",
-     []
-    ],
-    "README.md": [
-     "266c1435f079fae61028cae8cfafe30ac1901640",
-     []
-    ]
-   },
    "credential-management": {
     "META.yml": [
      "7b1860921312cc9d9934aa803e3f639df21423a0",
@@ -305091,6 +305105,10 @@
       "one-element-three-keyframes-animation2-ref.html": [
        "823d8ac3821638dd92cdccbc39497d1cc1dc797a",
        []
+      ],
+      "two-animation-diff-length-ref.html": [
+       "44e416fe8f2e4e4665365e6a32e0197dbed63a79",
+       []
       ]
      },
      "background-attachment-fixed-inside-transform-1-ref.html": [
@@ -309397,10 +309415,6 @@
       "d4a678d0746e87768b6a5be24a66b5f79e35a116",
       []
      ],
-     "css-flexbox-column-ref.html": [
-      "b0287c2490bb8c1332e26a747fc2d5ed7cf48e2a",
-      []
-     ],
      "css-flexbox-height-animation-stretch-ref.html": [
       "d7d3bff25c4755f4af3799ad0d743a124c876de6",
       []
@@ -355122,7 +355136,7 @@
     },
     "tools": {
      "build.sh": [
-      "a416d05dd4dc18a5dfed97f49d3e609769188cf2",
+      "968755121626a4a69866214cebcac56e39057bc8",
       []
      ],
      "html5lib_test.xml": [
@@ -355134,7 +355148,7 @@
       []
      ],
      "update_html5lib_tests.py": [
-      "e4f339a6053213645602b58c203b20b46a9b00cc",
+      "1ecce39f2af63bf7832af0e662bbc45411daa119",
       []
      ]
     },
@@ -376812,7 +376826,7 @@
         []
        ],
        "firefox.py": [
-        "83a883b98b5e1a8e639ab25168ebed5dfbefc108",
+        "3a4229841f8607de794783b7629a684bf2dfa9a2",
         []
        ],
        "firefox_android.py": [
@@ -377593,7 +377607,7 @@
        []
       ],
       "server.py": [
-       "1a007cda5b49465815db2dbddafd4f4bc186a0be",
+       "cfa86f993aaf665b81ab1c35f74d92e8cc67d89a",
        []
       ],
       "sslutils": {
@@ -377639,7 +377653,7 @@
      []
     ],
     "multi-touch-interactions.js": [
-     "7a8a6b21646ccd6575043fb2a46c55fecf587786",
+     "9faf63c0ad8206666360172565fbcd8c287031c9",
      []
     ],
     "support": {
@@ -378182,7 +378196,7 @@
    "urlpattern": {
     "resources": {
      "urlpatterntestdata.json": [
-      "a4b2c3281f0a057e1d0ce0a73b6e87b8ac5f348d",
+      "9e7fe20005bed1aa02a9db4dba749c3ba134449a",
       []
      ]
     }
@@ -380108,10 +380122,6 @@
      "4316c3804a28f44d1f86af97c86e478570b2437a",
      []
     ],
-    "RTCIceTransport-extension-helper.js": [
-     "659ec59b8df2847e7e2a3c513d3d6fd01027f16d",
-     []
-    ],
     "RTCPeerConnection-helper.js": [
      "1521277418fabddf5c11e79114e4c9fa41320f8b",
      []
@@ -380219,6 +380229,16 @@
      []
     ]
    },
+   "webrtc-ice": {
+    "META.yml": [
+     "e683349e3cb10ff0ad4c323c70daaec88f1148c2",
+     []
+    ],
+    "RTCIceTransport-extension-helper.js": [
+     "659ec59b8df2847e7e2a3c513d3d6fd01027f16d",
+     []
+    ]
+   },
    "webrtc-identity": {
     "META.yml": [
      "fb919db954b1fe92428c7291a4001641d08f7c8f",
@@ -419615,6 +419635,13 @@
         {}
        ]
       ],
+      "grid-items-percentage-paddings-015.html": [
+       "d6e8b7a4e50df9061691db47118235d8df506b71",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-items-percentage-paddings-vertical-lr-001.html": [
        "a21ab29de97ea472a5c241e3be7b36d018abfe17",
        [
@@ -521788,9 +521815,15 @@
      ]
     ],
     "pointerevent_auxclick_is_a_pointerevent.html": [
-     "aac73db9eb7c5f5a7c71207e52eab30bf53f3526",
+     "96b232867f0448cadfc43fdf2c730776e53ae6e6",
      [
-      null,
+      "pointerevents/pointerevent_auxclick_is_a_pointerevent.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_auxclick_is_a_pointerevent.html?pen",
       {
        "testdriver": true
       }
@@ -536629,7 +536662,7 @@
    },
    "screen_enumeration": {
     "getScreens.tentative.https.window.js": [
-     "acd38bb03b20cb4e087dcaf1ce17b9cb0b504048",
+     "a4d6ec0465a48c776a6ea8709d5671569112339e",
      [
       "screen_enumeration/getScreens.tentative.https.window.html",
       {
@@ -536651,7 +536684,7 @@
      ]
     ],
     "getScreens.values.https.html": [
-     "93b27b465561c1d97703f87804d4ba91389ef753",
+     "b29ff5ab309d592c5bf940a9d2008655841746a8",
      [
       null,
       {}
@@ -550770,6 +550803,15 @@
       }
      ]
     ],
+    "multi-touch-interactions.html": [
+     "a10416bdfd458cc7008ffc401153be08c7e068d0",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "multi-touch-interfaces.html": [
      "fae884480fea05e25f9c40007d0d5cd7e1db8390",
      [
@@ -563555,13 +563597,6 @@
       }
      ]
     ],
-    "RTCIceTransport-extension.https.html": [
-     "bb4d52adce5673bab5d527536d67f89a03a48cd2",
-     [
-      null,
-      {}
-     ]
-    ],
     "RTCIceTransport.html": [
      "fe12c384e5e5b3f8ab2e2b96b740d91959d16d94",
      [
@@ -564584,6 +564619,15 @@
      ]
     ]
    },
+   "webrtc-ice": {
+    "RTCIceTransport-extension.https.html": [
+     "bb4d52adce5673bab5d527536d67f89a03a48cd2",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "webrtc-identity": {
     "RTCPeerConnection-constructor.html": [
      "e7b7016338d8b8865b95098a0ec6f7eb2b65c4fb",
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/two-animation-diff-length.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/two-animation-diff-length.html.ini
new file mode 100644
index 00000000000..ee2a74435c9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/two-animation-diff-length.html.ini
@@ -0,0 +1,2 @@
+[two-animation-diff-length.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html.ini b/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html.ini
deleted file mode 100644
index 8450d5f7e43..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-flexbox-column-reverse-wrap-reverse.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse-wrap.html.ini b/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse-wrap.html.ini
deleted file mode 100644
index 84a1576713a..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse-wrap.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-flexbox-column-reverse-wrap.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse.html.ini b/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse.html.ini
deleted file mode 100644
index 9dbd483547d..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-reverse.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-flexbox-column-reverse.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-wrap-reverse.html.ini b/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-wrap-reverse.html.ini
deleted file mode 100644
index c10500b7496..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-wrap-reverse.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-flexbox-column-wrap-reverse.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-wrap.html.ini b/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-wrap.html.ini
deleted file mode 100644
index 4fbf254d78b..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column-wrap.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-flexbox-column-wrap.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column.html.ini b/tests/wpt/metadata/css/css-flexbox/css-flexbox-column.html.ini
deleted file mode 100644
index c222deb5a36..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/css-flexbox-column.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[css-flexbox-column.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-column-1.html.ini b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-column-1.html.ini
new file mode 100644
index 00000000000..75267327022
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-column-1.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-column-1.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-column-2.html.ini b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-column-2.html.ini
new file mode 100644
index 00000000000..91f810f44b5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-column-2.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-column-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-row-1.html.ini b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-row-1.html.ini
new file mode 100644
index 00000000000..7667ce7e1c1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-row-1.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-row-1.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-row-2.html.ini b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-row-2.html.ini
new file mode 100644
index 00000000000..69f39edd163
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-as-item-inflexible-in-row-2.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-inflexible-in-row-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-as-item-stretch-cross-size-3.html.ini b/tests/wpt/metadata/css/css-flexbox/table-as-item-stretch-cross-size-3.html.ini
new file mode 100644
index 00000000000..3c3c145d859
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-as-item-stretch-cross-size-3.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-stretch-cross-size-3.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
index 3932c11d225..6015df0effe 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
@@ -38,3 +38,6 @@
   [Test @font-face matching for weight 250]
     expected: FAIL
 
+  [Test @font-face matching for weight 420]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index 9ca3c31e0af..c495e1becc7 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -53,3 +53,276 @@
   [background-position length(px) / events]
     expected: FAIL
 
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [padding-bottom length(ex) / values]
+    expected: FAIL
+
+  [padding-bottom length(mm) / values]
+    expected: FAIL
+
+  [padding-bottom length(cm) / values]
+    expected: FAIL
+
+  [padding-bottom length(in) / values]
+    expected: FAIL
+
+  [padding-left length(pt) / values]
+    expected: FAIL
+
+  [padding-left length(pc) / values]
+    expected: FAIL
+
+  [padding-left length(px) / values]
+    expected: FAIL
+
+  [padding-left length(em) / values]
+    expected: FAIL
+
+  [padding-left length(ex) / values]
+    expected: FAIL
+
+  [padding-left length(mm) / values]
+    expected: FAIL
+
+  [padding-left length(cm) / values]
+    expected: FAIL
+
+  [padding-left length(in) / values]
+    expected: FAIL
+
+  [padding-right length(pt) / values]
+    expected: FAIL
+
+  [padding-right length(pc) / values]
+    expected: FAIL
+
+  [padding-right length(px) / values]
+    expected: FAIL
+
+  [padding-right length(em) / values]
+    expected: FAIL
+
+  [padding-right length(ex) / values]
+    expected: FAIL
+
+  [padding-right length(mm) / values]
+    expected: FAIL
+
+  [padding-right length(cm) / values]
+    expected: FAIL
+
+  [padding-right length(in) / values]
+    expected: FAIL
+
+  [padding-top length(pt) / values]
+    expected: FAIL
+
+  [padding-top length(pc) / values]
+    expected: FAIL
+
+  [padding-top length(px) / values]
+    expected: FAIL
+
+  [padding-top length(em) / values]
+    expected: FAIL
+
+  [padding-top length(ex) / values]
+    expected: FAIL
+
+  [padding-top length(mm) / values]
+    expected: FAIL
+
+  [padding-top length(cm) / values]
+    expected: FAIL
+
+  [padding-top length(in) / values]
+    expected: FAIL
+
+  [margin-bottom length(pt) / values]
+    expected: FAIL
+
+  [margin-bottom length(pc) / values]
+    expected: FAIL
+
+  [margin-bottom length(px) / values]
+    expected: FAIL
+
+  [margin-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-bottom length(ex) / values]
+    expected: FAIL
+
+  [margin-bottom length(mm) / values]
+    expected: FAIL
+
+  [margin-bottom length(cm) / values]
+    expected: FAIL
+
+  [margin-bottom length(in) / values]
+    expected: FAIL
+
+  [margin-left length(pt) / values]
+    expected: FAIL
+
+  [margin-left length(pc) / values]
+    expected: FAIL
+
+  [margin-left length(px) / values]
+    expected: FAIL
+
+  [margin-left length(em) / values]
+    expected: FAIL
+
+  [margin-left length(ex) / values]
+    expected: FAIL
+
+  [margin-left length(mm) / values]
+    expected: FAIL
+
+  [margin-left length(cm) / values]
+    expected: FAIL
+
+  [margin-left length(in) / values]
+    expected: FAIL
+
+  [margin-right length(pt) / values]
+    expected: FAIL
+
+  [margin-right length(pc) / values]
+    expected: FAIL
+
+  [margin-right length(px) / values]
+    expected: FAIL
+
+  [margin-right length(em) / values]
+    expected: FAIL
+
+  [margin-right length(ex) / values]
+    expected: FAIL
+
+  [margin-right length(mm) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-implicit-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-implicit-001.html.ini
index c06f494a4a0..e8d7848fdbd 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-implicit-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-implicit-001.html.ini
@@ -5,6 +5,3 @@
   [background-position length-em(em) / values]
     expected: FAIL
 
-  [top length-em(em) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
index 5d20389c8e9..ce6bf545593 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,3 +56,576 @@
   [background-position length(px) / events]
     expected: FAIL
 
+  [background-color color(rgba) / events]
+    expected: FAIL
+
+  [border-top-width length(pt) / events]
+    expected: FAIL
+
+  [border-top-width length(pc) / events]
+    expected: FAIL
+
+  [border-top-width length(px) / events]
+    expected: FAIL
+
+  [border-top-width length(em) / events]
+    expected: FAIL
+
+  [border-top-width length(ex) / events]
+    expected: FAIL
+
+  [border-top-width length(mm) / events]
+    expected: FAIL
+
+  [border-top-width length(cm) / events]
+    expected: FAIL
+
+  [border-top-width length(in) / events]
+    expected: FAIL
+
+  [border-right-width length(pt) / events]
+    expected: FAIL
+
+  [border-right-width length(pc) / events]
+    expected: FAIL
+
+  [border-right-width length(px) / events]
+    expected: FAIL
+
+  [border-right-width length(em) / events]
+    expected: FAIL
+
+  [border-right-width length(ex) / events]
+    expected: FAIL
+
+  [border-right-width length(mm) / events]
+    expected: FAIL
+
+  [border-right-width length(cm) / events]
+    expected: FAIL
+
+  [border-right-width length(in) / events]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / events]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / events]
+    expected: FAIL
+
+  [border-bottom-width length(px) / events]
+    expected: FAIL
+
+  [border-bottom-width length(em) / events]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / events]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / events]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / events]
+    expected: FAIL
+
+  [border-bottom-width length(in) / events]
+    expected: FAIL
+
+  [border-left-width length(pt) / events]
+    expected: FAIL
+
+  [border-left-width length(pc) / events]
+    expected: FAIL
+
+  [border-left-width length(px) / events]
+    expected: FAIL
+
+  [border-left-width length(em) / events]
+    expected: FAIL
+
+  [border-left-width length(ex) / events]
+    expected: FAIL
+
+  [border-left-width length(mm) / events]
+    expected: FAIL
+
+  [border-left-width length(cm) / events]
+    expected: FAIL
+
+  [border-left-width length(in) / events]
+    expected: FAIL
+
+  [border-top-color color(rgba) / events]
+    expected: FAIL
+
+  [border-right-color color(rgba) / events]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / events]
+    expected: FAIL
+
+  [border-left-color color(rgba) / events]
+    expected: FAIL
+
+  [padding-bottom length(pt) / events]
+    expected: FAIL
+
+  [padding-bottom length(pc) / events]
+    expected: FAIL
+
+  [padding-bottom length(px) / events]
+    expected: FAIL
+
+  [padding-bottom length(em) / events]
+    expected: FAIL
+
+  [padding-bottom length(ex) / events]
+    expected: FAIL
+
+  [padding-bottom length(mm) / events]
+    expected: FAIL
+
+  [padding-bottom length(cm) / events]
+    expected: FAIL
+
+  [padding-bottom length(in) / events]
+    expected: FAIL
+
+  [padding-left length(pt) / events]
+    expected: FAIL
+
+  [padding-left length(pc) / events]
+    expected: FAIL
+
+  [padding-left length(px) / events]
+    expected: FAIL
+
+  [padding-left length(em) / events]
+    expected: FAIL
+
+  [padding-left length(ex) / events]
+    expected: FAIL
+
+  [padding-left length(mm) / events]
+    expected: FAIL
+
+  [padding-left length(cm) / events]
+    expected: FAIL
+
+  [padding-left length(in) / events]
+    expected: FAIL
+
+  [padding-right length(pt) / events]
+    expected: FAIL
+
+  [padding-right length(pc) / events]
+    expected: FAIL
+
+  [padding-right length(px) / events]
+    expected: FAIL
+
+  [padding-right length(em) / events]
+    expected: FAIL
+
+  [padding-right length(ex) / events]
+    expected: FAIL
+
+  [padding-right length(mm) / events]
+    expected: FAIL
+
+  [padding-right length(cm) / events]
+    expected: FAIL
+
+  [padding-right length(in) / events]
+    expected: FAIL
+
+  [padding-top length(pt) / events]
+    expected: FAIL
+
+  [padding-top length(pc) / events]
+    expected: FAIL
+
+  [padding-top length(px) / events]
+    expected: FAIL
+
+  [padding-top length(em) / events]
+    expected: FAIL
+
+  [padding-top length(ex) / events]
+    expected: FAIL
+
+  [padding-top length(mm) / events]
+    expected: FAIL
+
+  [padding-top length(cm) / events]
+    expected: FAIL
+
+  [padding-top length(in) / events]
+    expected: FAIL
+
+  [margin-bottom length(pt) / events]
+    expected: FAIL
+
+  [margin-bottom length(pc) / events]
+    expected: FAIL
+
+  [margin-bottom length(px) / events]
+    expected: FAIL
+
+  [margin-bottom length(em) / events]
+    expected: FAIL
+
+  [margin-bottom length(ex) / events]
+    expected: FAIL
+
+  [margin-bottom length(mm) / events]
+    expected: FAIL
+
+  [margin-bottom length(cm) / events]
+    expected: FAIL
+
+  [margin-bottom length(in) / events]
+    expected: FAIL
+
+  [margin-left length(pt) / events]
+    expected: FAIL
+
+  [margin-left length(pc) / events]
+    expected: FAIL
+
+  [margin-left length(px) / events]
+    expected: FAIL
+
+  [margin-left length(em) / events]
+    expected: FAIL
+
+  [margin-left length(ex) / events]
+    expected: FAIL
+
+  [margin-left length(mm) / events]
+    expected: FAIL
+
+  [margin-left length(cm) / events]
+    expected: FAIL
+
+  [margin-left length(in) / events]
+    expected: FAIL
+
+  [margin-right length(pt) / events]
+    expected: FAIL
+
+  [margin-right length(pc) / events]
+    expected: FAIL
+
+  [margin-right length(px) / events]
+    expected: FAIL
+
+  [margin-right length(em) / events]
+    expected: FAIL
+
+  [margin-right length(ex) / events]
+    expected: FAIL
+
+  [margin-right length(mm) / events]
+    expected: FAIL
+
+  [max-height length(ex) / events]
+    expected: FAIL
+
+  [max-height length(mm) / events]
+    expected: FAIL
+
+  [max-height length(cm) / events]
+    expected: FAIL
+
+  [max-height length(in) / events]
+    expected: FAIL
+
+  [max-height percentage(%) / events]
+    expected: FAIL
+
+  [max-width length(pt) / events]
+    expected: FAIL
+
+  [max-width length(pc) / events]
+    expected: FAIL
+
+  [max-width length(px) / events]
+    expected: FAIL
+
+  [max-width length(em) / events]
+    expected: FAIL
+
+  [max-width length(ex) / events]
+    expected: FAIL
+
+  [max-width length(mm) / events]
+    expected: FAIL
+
+  [max-width length(cm) / events]
+    expected: FAIL
+
+  [max-width length(in) / events]
+    expected: FAIL
+
+  [max-width percentage(%) / events]
+    expected: FAIL
+
+  [top length(pt) / events]
+    expected: FAIL
+
+  [top length(pc) / events]
+    expected: FAIL
+
+  [top length(px) / events]
+    expected: FAIL
+
+  [top length(em) / events]
+    expected: FAIL
+
+  [top length(ex) / events]
+    expected: FAIL
+
+  [top length(mm) / events]
+    expected: FAIL
+
+  [top length(cm) / events]
+    expected: FAIL
+
+  [top length(in) / events]
+    expected: FAIL
+
+  [top percentage(%) / events]
+    expected: FAIL
+
+  [right length(pt) / events]
+    expected: FAIL
+
+  [right length(pc) / events]
+    expected: FAIL
+
+  [right length(px) / events]
+    expected: FAIL
+
+  [right length(em) / events]
+    expected: FAIL
+
+  [right length(ex) / events]
+    expected: FAIL
+
+  [right length(mm) / events]
+    expected: FAIL
+
+  [right length(cm) / events]
+    expected: FAIL
+
+  [right length(in) / events]
+    expected: FAIL
+
+  [right percentage(%) / events]
+    expected: FAIL
+
+  [bottom length(pt) / events]
+    expected: FAIL
+
+  [bottom length(pc) / events]
+    expected: FAIL
+
+  [bottom length(px) / events]
+    expected: FAIL
+
+  [bottom length(em) / events]
+    expected: FAIL
+
+  [bottom length(ex) / events]
+    expected: FAIL
+
+  [bottom length(mm) / events]
+    expected: FAIL
+
+  [bottom length(cm) / events]
+    expected: FAIL
+
+  [bottom length(in) / events]
+    expected: FAIL
+
+  [bottom percentage(%) / events]
+    expected: FAIL
+
+  [left length(pt) / events]
+    expected: FAIL
+
+  [left length(pc) / events]
+    expected: FAIL
+
+  [left length(px) / events]
+    expected: FAIL
+
+  [left length(em) / events]
+    expected: FAIL
+
+  [left length(ex) / events]
+    expected: FAIL
+
+  [left length(mm) / events]
+    expected: FAIL
+
+  [left length(cm) / events]
+    expected: FAIL
+
+  [left length(in) / events]
+    expected: FAIL
+
+  [left percentage(%) / events]
+    expected: FAIL
+
+  [color color(rgba) / events]
+    expected: FAIL
+
+  [font-size length(pt) / events]
+    expected: FAIL
+
+  [font-size length(pc) / events]
+    expected: FAIL
+
+  [font-size length(px) / events]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
+  [font-size length(ex) / events]
+    expected: FAIL
+
+  [font-size length(mm) / events]
+    expected: FAIL
+
+  [font-size length(cm) / events]
+    expected: FAIL
+
+  [font-size length(in) / events]
+    expected: FAIL
+
+  [font-size percentage(%) / events]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / events]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / events]
+    expected: FAIL
+
+  [line-height number(integer) / events]
+    expected: FAIL
+
+  [line-height number(decimal) / events]
+    expected: FAIL
+
+  [line-height length(pt) / events]
+    expected: FAIL
+
+  [line-height length(pc) / events]
+    expected: FAIL
+
+  [line-height length(px) / events]
+    expected: FAIL
+
+  [line-height length(em) / events]
+    expected: FAIL
+
+  [line-height length(ex) / events]
+    expected: FAIL
+
+  [line-height length(mm) / events]
+    expected: FAIL
+
+  [line-height length(cm) / events]
+    expected: FAIL
+
+  [line-height length(in) / events]
+    expected: FAIL
+
+  [line-height percentage(%) / events]
+    expected: FAIL
+
+  [letter-spacing length(pt) / events]
+    expected: FAIL
+
+  [letter-spacing length(pc) / events]
+    expected: FAIL
+
+  [letter-spacing length(px) / events]
+    expected: FAIL
+
+  [letter-spacing length(em) / events]
+    expected: FAIL
+
+  [letter-spacing length(ex) / events]
+    expected: FAIL
+
+  [letter-spacing length(mm) / events]
+    expected: FAIL
+
+  [letter-spacing length(cm) / events]
+    expected: FAIL
+
+  [letter-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing length(pt) / events]
+    expected: FAIL
+
+  [word-spacing length(pc) / events]
+    expected: FAIL
+
+  [word-spacing length(px) / events]
+    expected: FAIL
+
+  [word-spacing length(em) / events]
+    expected: FAIL
+
+  [word-spacing length(ex) / events]
+    expected: FAIL
+
+  [word-spacing length(mm) / events]
+    expected: FAIL
+
+  [word-spacing length(cm) / events]
+    expected: FAIL
+
+  [word-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing percentage(%) / events]
+    expected: FAIL
+
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index 5c36812ca0d..492f1b2bd2e 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
@@ -53,3 +53,276 @@
   [background-position length(px) / events]
     expected: FAIL
 
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [padding-bottom length(ex) / values]
+    expected: FAIL
+
+  [padding-bottom length(mm) / values]
+    expected: FAIL
+
+  [padding-bottom length(cm) / values]
+    expected: FAIL
+
+  [padding-bottom length(in) / values]
+    expected: FAIL
+
+  [padding-left length(pt) / values]
+    expected: FAIL
+
+  [padding-left length(pc) / values]
+    expected: FAIL
+
+  [padding-left length(px) / values]
+    expected: FAIL
+
+  [padding-left length(em) / values]
+    expected: FAIL
+
+  [padding-left length(ex) / values]
+    expected: FAIL
+
+  [padding-left length(mm) / values]
+    expected: FAIL
+
+  [padding-left length(cm) / values]
+    expected: FAIL
+
+  [padding-left length(in) / values]
+    expected: FAIL
+
+  [padding-right length(pt) / values]
+    expected: FAIL
+
+  [padding-right length(pc) / values]
+    expected: FAIL
+
+  [padding-right length(px) / values]
+    expected: FAIL
+
+  [padding-right length(em) / values]
+    expected: FAIL
+
+  [padding-right length(ex) / values]
+    expected: FAIL
+
+  [padding-right length(mm) / values]
+    expected: FAIL
+
+  [padding-right length(cm) / values]
+    expected: FAIL
+
+  [padding-right length(in) / values]
+    expected: FAIL
+
+  [padding-top length(pt) / values]
+    expected: FAIL
+
+  [padding-top length(pc) / values]
+    expected: FAIL
+
+  [padding-top length(px) / values]
+    expected: FAIL
+
+  [padding-top length(em) / values]
+    expected: FAIL
+
+  [padding-top length(ex) / values]
+    expected: FAIL
+
+  [padding-top length(mm) / values]
+    expected: FAIL
+
+  [padding-top length(cm) / values]
+    expected: FAIL
+
+  [padding-top length(in) / values]
+    expected: FAIL
+
+  [margin-bottom length(pt) / values]
+    expected: FAIL
+
+  [margin-bottom length(pc) / values]
+    expected: FAIL
+
+  [margin-bottom length(px) / values]
+    expected: FAIL
+
+  [margin-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-bottom length(ex) / values]
+    expected: FAIL
+
+  [margin-bottom length(mm) / values]
+    expected: FAIL
+
+  [margin-bottom length(cm) / values]
+    expected: FAIL
+
+  [margin-bottom length(in) / values]
+    expected: FAIL
+
+  [margin-left length(pt) / values]
+    expected: FAIL
+
+  [margin-left length(pc) / values]
+    expected: FAIL
+
+  [margin-left length(px) / values]
+    expected: FAIL
+
+  [margin-left length(em) / values]
+    expected: FAIL
+
+  [margin-left length(ex) / values]
+    expected: FAIL
+
+  [margin-left length(mm) / values]
+    expected: FAIL
+
+  [margin-left length(cm) / values]
+    expected: FAIL
+
+  [margin-left length(in) / values]
+    expected: FAIL
+
+  [margin-right length(pt) / values]
+    expected: FAIL
+
+  [margin-right length(pc) / values]
+    expected: FAIL
+
+  [margin-right length(px) / values]
+    expected: FAIL
+
+  [margin-right length(em) / values]
+    expected: FAIL
+
+  [margin-right length(ex) / values]
+    expected: FAIL
+
+  [margin-right length(mm) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..25e4ef49e32 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -1,7 +1,4 @@
 [elementsFromPoint-iframes.html]
-  [elementsFromPoint on the root document for points in iframe elements]
-    expected: FAIL
-
   [elementsFromPoint on inner documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 71eca2f732f..7f24431f802 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,18 +309,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: separate response Content-Type: text/plain */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index e67f0406fc3..5c001592859 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,3 +53,9 @@
   [combined text/javascript ]
     expected: FAIL
 
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index dc2e45516de..385376c7321 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_4.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..16fa2c5cfc1
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,4 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index c757b400205..442db3cb549 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -7,5 +6,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index dab21cae5d8..d1ca01ebc5f 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,11 +7,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
-
-  [Host element with delegatesFocus should support autofocus]
     expected: TIMEOUT
 
+  [Host element with delegatesFocus should support autofocus]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73c..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index d43f38b40cd..45d8be1c898 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini
index 92e07546781..d38ac835316 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html.ini
@@ -1,31 +1,10 @@
 [parse-a-sizes-attribute-display-none.html]
-  [<img srcset="/images/green-1x1.png?e36a 50w, /images/green-16x16.png?e36a 51w" sizes="min(1px, 100px)"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?e36b 50w, /images/green-16x16.png?e36b 51w" sizes="min(-100px, 1px)"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?e37a 50w, /images/green-16x16.png?e37a 51w" sizes="(min-width:0) min(1px, 100px)"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f49b 50w, /images/green-16x16.png?f49b 51w" sizes="(min-width:0) max(-200vw, 1px"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f49a 50w, /images/green-16x16.png?f49a 51w" sizes="(min-width:0) min(1px, 200vw"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f48b 50w, /images/green-16x16.png?f48b 51w" sizes="max(-200vw, 1px"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (display:none)]
     expected: FAIL
 
   [<img srcset="/images/green-1x1.png?e38b 50w, /images/green-16x16.png?e38b 51w" sizes="(min-width:max(-200vw, 0)) 1px"> ref sizes="1px" (display:none)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?f48a 50w, /images/green-16x16.png?f48a 51w" sizes="min(1px, 200vw"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (display:none)]
     expected: FAIL
 
@@ -35,9 +14,6 @@
   [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (display:none)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e37b 50w, /images/green-16x16.png?e37b 51w" sizes="(min-width:0) max(-100px, 1px)"> ref sizes="1px" (display:none)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (display:none)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
index a0e0184eb46..68d7116950c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
@@ -2,15 +2,6 @@
   [<img srcset="/images/green-1x1.png?e38b 50w, /images/green-16x16.png?e38b 51w" sizes="(min-width:max(-200vw, 0)) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?f49b 50w, /images/green-16x16.png?f49b 51w" sizes="(min-width:0) max(-200vw, 1px"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f48a 50w, /images/green-16x16.png?f48a 51w" sizes="min(1px, 200vw"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?e36b 50w, /images/green-16x16.png?e36b 51w" sizes="min(-100px, 1px)"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
@@ -23,30 +14,15 @@
   [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?f49a 50w, /images/green-16x16.png?f49a 51w" sizes="(min-width:0) min(1px, 200vw"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e38a 50w, /images/green-16x16.png?e38a 51w" sizes="(min-width:min(0, 200vw)) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
   [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e37a 50w, /images/green-16x16.png?e37a 51w" sizes="(min-width:0) min(1px, 100px)"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f48b 50w, /images/green-16x16.png?f48b 51w" sizes="max(-200vw, 1px"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
   [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (quirks mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e37b 50w, /images/green-16x16.png?e37b 51w" sizes="(min-width:0) max(-100px, 1px)"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?e36a 50w, /images/green-16x16.png?e36a 51w" sizes="min(1px, 100px)"> ref sizes="1px" (quirks mode)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
index caa0aa5f39e..ab96ae0e69d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html.ini
@@ -5,27 +5,12 @@
   [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (standards mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?f48b 50w, /images/green-16x16.png?f48b 51w" sizes="max(-200vw, 1px"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (standards mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e36b 50w, /images/green-16x16.png?e36b 51w" sizes="min(-100px, 1px)"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?e37b 50w, /images/green-16x16.png?e37b 51w" sizes="(min-width:0) max(-100px, 1px)"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?e37a 50w, /images/green-16x16.png?e37a 51w" sizes="(min-width:0) min(1px, 100px)"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (standards mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?f49a 50w, /images/green-16x16.png?f49a 51w" sizes="(min-width:0) min(1px, 200vw"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (standards mode)]
     expected: FAIL
 
@@ -38,15 +23,6 @@
   [<img srcset="/images/green-1x1.png?e38b 50w, /images/green-16x16.png?e38b 51w" sizes="(min-width:max(-200vw, 0)) 1px"> ref sizes="1px" (standards mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?f48a 50w, /images/green-16x16.png?f48a 51w" sizes="min(1px, 200vw"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f49b 50w, /images/green-16x16.png?f49b 51w" sizes="(min-width:0) max(-200vw, 1px"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (standards mode)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e36a 50w, /images/green-16x16.png?e36a 51w" sizes="min(1px, 100px)"> ref sizes="1px" (standards mode)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
index c3522eadce0..d4ad2c2710a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html.ini
@@ -1,34 +1,16 @@
 [parse-a-sizes-attribute-width-1000px.html]
-  [<img srcset="/images/green-1x1.png?e37a 50w, /images/green-16x16.png?e37a 51w" sizes="(min-width:0) min(1px, 100px)"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f49b 50w, /images/green-16x16.png?f49b 51w" sizes="(min-width:0) max(-200vw, 1px"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e38b 50w, /images/green-16x16.png?e38b 51w" sizes="(min-width:max(-200vw, 0)) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
   [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e37b 50w, /images/green-16x16.png?e37b 51w" sizes="(min-width:0) max(-100px, 1px)"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e38a 50w, /images/green-16x16.png?e38a 51w" sizes="(min-width:min(0, 200vw)) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
   [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e36b 50w, /images/green-16x16.png?e36b 51w" sizes="min(-100px, 1px)"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f48b 50w, /images/green-16x16.png?f48b 51w" sizes="max(-200vw, 1px"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f48a 50w, /images/green-16x16.png?f48a 51w" sizes="min(1px, 200vw"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
   [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
@@ -44,9 +26,3 @@
   [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
-  [<img srcset="/images/green-1x1.png?e36a 50w, /images/green-16x16.png?e36a 51w" sizes="min(1px, 100px)"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
-  [<img srcset="/images/green-1x1.png?f49a 50w, /images/green-16x16.png?f49a 51w" sizes="(min-width:0) min(1px, 200vw"> ref sizes="1px" (width:1000px)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 1f889a84dea..9370521a51a 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,28 +1,10 @@
 [select-event.html]
-  [input type text: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -35,42 +17,69 @@
   [input type text: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
+  [textarea: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
+  [textarea: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 510ea619a7d..a057142bbc5 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -8,11 +7,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..a9677391662
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,4 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
index 9d262275083..d7071b6bcee 100644
--- a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,3 +2,6 @@
   [test_element_in_object]
     expected: FAIL
 
+  [test_element_in_collection]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bf2a1d61bab..bfd4d6dd2d6 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,4 +1,5 @@
 [import-in-moduleworker.html]
+  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 650c91da4a6..333edb3a26e 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,5 +1,4 @@
 [sharedworker-in-worker.html]
-  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/META.yml b/tests/wpt/web-platform-tests/cors-rfc1918/META.yml
deleted file mode 100644
index 7f0d420a0e6..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/META.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-spec: https://wicg.github.io/cors-rfc1918/
-suggested_reviewers:
-  - letitz
-  - camillelamy
-  - mikewest
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/README.md b/tests/wpt/web-platform-tests/cors-rfc1918/README.md
deleted file mode 100644
index 266c1435f07..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory is being deleted. See ../fetch/cors-rfc1918/ instead.
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-animation-diff-length-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-animation-diff-length-ref.html
new file mode 100644
index 00000000000..44e416fe8f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-animation-diff-length-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<body>
+  <canvas id="canvas" width="100" height="100"></canvas>
+</body>
+<script>
+  var canvas = document.getElementById('canvas');
+  var ctx = canvas.getContext('2d');
+  ctx.fillStyle = 'rgb(0, 0, 199)';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-animation-diff-length.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-animation-diff-length.html
new file mode 100644
index 00000000000..4faffd0425c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-animation-diff-length.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-color">
+<link rel="match" href="two-animation-diff-length-ref.html">
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+  animation: bgcolor2 10s, bgcolor1 0.001s;
+}
+@keyframes bgcolor1 {
+  0% { background-color: rgb(0, 200, 0); }
+  100% { background-color: rgb(200, 0, 0); }
+}
+@keyframes bgcolor2 {
+  0% { background-color: rgb(0, 0, 199); }
+  100% { background-color: rgb(0, 0, 200); }
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="../../../web-animations/testcommon.js"></script>
+<body>
+<div class="container"></div>
+
+<script>
+// This test ensures that if we have two different-length animation, when the
+// one with higher compositing order finishes, the other one would still run
+// normally.
+const animations = document.getAnimations();
+Promise.all([animations[0].ready, animations[1].ready]).then(() => {
+  waitForAnimationFrames(3).then(() => {
+    takeScreenshot();
+  });
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow.html b/tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow.html
new file mode 100644
index 00000000000..93bc149ec1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#monolithic">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-gap:0; column-fill:auto; width:100px; height:100px; background:red;">
+  <div style="height:100px; background:green;"></div>
+  <div style="contain:size; height:0;">
+    <div style="height:100px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-ref.html
deleted file mode 100644
index b0287c2490b..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-ref.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Tsutomu ogaoga Ogasawara" href="mailto:info@ogaoga.org">
-    <style type="text/css">
-        .container {
-            color: white;
-            width: 9em;
-        }
-        .item {
-            writing-mode: vertical-rl;
-            background: green;
-            height: 4em;
-            width: 1.5em;
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">１２３</div>
-        <div class="item">ａｂｃ</div>
-        <div class="item">４５６</div>
-        <div class="item">ｄｅｆ</div>
-        <div class="item">７８９</div>
-        <div class="item">ｓｔｕ</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html
deleted file mode 100644
index d4787bca455..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html> <!-- coding:utf-8 -->
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Flexbox Test: flex direction: row</title>
-    <link rel="author" title="Naoki Okada" href="mailto:somathor@gmail.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-flow-property">
-    <link rel="match" href="css-flexbox-column-ref.html">
-    <meta name="flags" content="">
-    <meta name="assert" content="Test checks that when writing mode is vertical and flex-flow: column wrap-reverse, the flex container is vertical.">
-    <style type="text/css">
-        .container {
-            display: flex;
-            flex-flow: column-reverse wrap-reverse;
-            writing-mode: vertical-rl;
-            width: 9em;
-            min-height: 4em;
-            color: white;
-            align-content: flex-end;
-            background: green;
-        }
-        .item {
-            background: green;
-            height: 1em;
-            width: 1.5em;
-
-            /* make sure UA that doesn't support writing mode and flexbox fails. */
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">ｕ</div>
-        <div class="item">９</div>
-        <div class="item">ｆ</div>
-        <div class="item">６</div>
-        <div class="item">ｃ</div>
-        <div class="item">３</div>
-        <div class="item">ｔ</div>
-        <div class="item">８</div>
-        <div class="item">ｅ</div>
-        <div class="item">５</div>
-        <div class="item">ｂ</div>
-        <div class="item">２</div>
-        <div class="item">ｓ</div>
-        <div class="item">７</div>
-        <div class="item">ｄ</div>
-        <div class="item">４</div>
-        <div class="item">ａ</div>
-        <div class="item">１</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse-wrap.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse-wrap.html
deleted file mode 100644
index 05c4c7f54cf..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse-wrap.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html> <!-- coding:utf-8 -->
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Flexbox Test: flex direction: row</title>
-    <link rel="author" title="Naoki Okada" href="mailto:somathor@gmail.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-flow-property">
-    <link rel="match" href="css-flexbox-column-ref.html">
-    <meta name="flags" content="">
-    <meta name="assert" content="Test checks that when writing mode is vertical and flex-flow: column wrap, the flex container is vertical.">
-    <style type="text/css">
-        .container {
-            display: flex;
-            flex-flow: column-reverse wrap;
-            writing-mode: vertical-rl;
-            width: 9em;
-            min-height: 4em;
-            color: white;
-            align-content: flex-start;
-            background: green;
-        }
-        .item {
-            background: green;
-            height: 1em;
-            width: 1.5em;
-
-            /* make sure UA that doesn't support writing mode and flexbox fails. */
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">ｓ</div>
-        <div class="item">７</div>
-        <div class="item">ｄ</div>
-        <div class="item">４</div>
-        <div class="item">ａ</div>
-        <div class="item">１</div>
-        <div class="item">ｔ</div>
-        <div class="item">８</div>
-        <div class="item">ｅ</div>
-        <div class="item">５</div>
-        <div class="item">ｂ</div>
-        <div class="item">２</div>
-        <div class="item">ｕ</div>
-        <div class="item">９</div>
-        <div class="item">ｆ</div>
-        <div class="item">６</div>
-        <div class="item">ｃ</div>
-        <div class="item">３</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse.html
deleted file mode 100644
index 9115ae35236..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-reverse.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html> <!-- coding:utf-8 -->
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Flexbox Test: flex direction: row</title>
-    <link rel="author" title="Naoki Okada" href="mailto:somathor@gmail.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-flow-property">
-    <link rel="match" href="css-flexbox-column-ref.html">
-    <meta name="flags" content="">
-    <meta name="assert" content="Test checks that when writing mode is vertical and flex-flow: column, the flex container is vertical.">
-    <style type="text/css">
-        .container {
-            display: flex;
-            flex-flow: column-reverse;
-            writing-mode: vertical-rl;
-            width: 9em;
-            color: white;
-        }
-        .item {
-            background: green;
-            height: 4em;
-            width: 1.5em;
-
-            /* make sure UA that doesn't support writing mode and flexbox fails. */
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">ｓｔｕ</div>
-        <div class="item">７８９</div>
-        <div class="item">ｄｅｆ</div>
-        <div class="item">４５６</div>
-        <div class="item">ａｂｃ</div>
-        <div class="item">１２３</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-wrap-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-wrap-reverse.html
deleted file mode 100644
index ec309ba8097..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-wrap-reverse.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html> <!-- coding:utf-8 -->
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Flexbox Test: flex direction: row</title>
-    <link rel="author" title="Naoki Okada" href="mailto:somathor@gmail.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-flow-property">
-    <link rel="match" href="css-flexbox-column-ref.html">
-    <meta name="flags" content="">
-    <meta name="assert" content="Test checks that when writing mode is vertical and flex-flow: column wrap-reverse, the flex container is vertical.">
-    <style type="text/css">
-        .container {
-            display: flex;
-            flex-flow: column wrap-reverse;
-            writing-mode: vertical-rl;
-            width: 9em;
-            min-height: 4em;
-            color: white;
-            align-content: flex-end;
-            background: green;
-        }
-        .item {
-            background: green;
-            height: 1em;
-            width: 1.5em;
-
-            /* make sure UA that doesn't support writing mode and flexbox fails. */
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">３</div>
-        <div class="item">ｃ</div>
-        <div class="item">６</div>
-        <div class="item">ｆ</div>
-        <div class="item">９</div>
-        <div class="item">ｕ</div>
-        <div class="item">２</div>
-        <div class="item">ｂ</div>
-        <div class="item">５</div>
-        <div class="item">ｅ</div>
-        <div class="item">８</div>
-        <div class="item">ｔ</div>
-        <div class="item">１</div>
-        <div class="item">ａ</div>
-        <div class="item">４</div>
-        <div class="item">ｄ</div>
-        <div class="item">７</div>
-        <div class="item">ｓ</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-wrap.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-wrap.html
deleted file mode 100644
index c4797a9d7d5..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column-wrap.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html> <!-- coding:utf-8 -->
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Flexbox Test: flex direction: row</title>
-    <link rel="author" title="Naoki Okada" href="mailto:somathor@gmail.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-flow-property">
-    <link rel="match" href="css-flexbox-column-ref.html">
-    <meta name="flags" content="">
-    <meta name="assert" content="Test checks that when writing mode is vertical and flex-flow: column wrap, the flex container is vertical.">
-    <style type="text/css">
-        .container {
-            display: flex;
-            flex-flow: column wrap;
-            writing-mode: vertical-rl;
-            width: 9em;
-            min-height: 4em;
-            color: white;
-            align-content: flex-start;
-            background: green;
-        }
-        .item {
-            background: green;
-            height: 1em;
-            width: 1.5em;
-
-            /* make sure UA that doesn't support writing mode and flexbox fails. */
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">１</div>
-        <div class="item">ａ</div>
-        <div class="item">４</div>
-        <div class="item">ｄ</div>
-        <div class="item">７</div>
-        <div class="item">ｓ</div>
-        <div class="item">２</div>
-        <div class="item">ｂ</div>
-        <div class="item">５</div>
-        <div class="item">ｅ</div>
-        <div class="item">８</div>
-        <div class="item">ｔ</div>
-        <div class="item">３</div>
-        <div class="item">ｃ</div>
-        <div class="item">６</div>
-        <div class="item">ｆ</div>
-        <div class="item">９</div>
-        <div class="item">ｕ</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column.html b/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column.html
deleted file mode 100644
index c633a443f56..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-column.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html> <!-- coding:utf-8 -->
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>CSS Flexbox Test: flex direction: row</title>
-    <link rel="author" title="Naoki Okada" href="mailto:somathor@gmail.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-flow-property">
-    <link rel="match" href="css-flexbox-column-ref.html">
-    <meta name="flags" content="">
-    <meta name="assert" content="Test checks that when writing mode is vertical and flex-flow: column, the flex container is vertical.">
-    <style type="text/css">
-        .container {
-            display: flex;
-            flex-flow: column;
-            writing-mode: vertical-rl;
-            width: 9em;
-            color: white;
-        }
-        .item {
-            background: green;
-            height: 4em;
-            width: 1.5em;
-
-            /* make sure UA that doesn't support writing mode and flexbox fails. */
-            float: right;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passes if you see a tall green box with pairs of the digits 1-9 and a-i listed right to left in two columns.</p>
-    <div class="container">
-        <div class="item">１２３</div>
-        <div class="item">ａｂｃ</div>
-        <div class="item">４５６</div>
-        <div class="item">ｄｅｆ</div>
-        <div class="item">７８９</div>
-        <div class="item">ｓｔｕ</div>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html
new file mode 100644
index 00000000000..201a97fb452
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Table as a flex item in column-oriented flex container</title>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#resolve-flexible-lengths">
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#computing-the-table-height">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1692116">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Inflexible table flex item's flex base size is its final main size.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: flex; flex-direction: column;">
+  <div style="display: table; border: 10px solid green; width: 80px; background: green; flex: 0 0 80px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html
new file mode 100644
index 00000000000..74c7b0324d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Table as a flex item in column-oriented flex container</title>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#resolve-flexible-lengths">
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#computing-the-table-height">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1692116">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Inflexible table flex item's flex base size is its final main size.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: flex; flex-direction: column;">
+  <table style="box-sizing: content-box; border: 10px solid green; background: green;
+                width: 80px; flex: 0 0 50px">
+    <caption style="height: 10px; border: 10px solid green; background: green;"></caption>
+  </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html
new file mode 100644
index 00000000000..073e7f7274a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Table as a flex item in row-oriented flex container</title>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#resolve-flexible-lengths">
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#computing-the-table-width">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1692116">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Inflexible table flex item's flex base size is its final main size.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: flex; flex-direction: row;">
+  <div style="display: table; border: 10px solid green; height: 80px; background: green; flex: 0 0 80px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html
new file mode 100644
index 00000000000..f01e0913659
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Table as a flex item in row-oriented flex container</title>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#resolve-flexible-lengths">
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#computing-the-table-width">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1692116">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Inflexible table flex item's flex base size is its final main size.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: flex; flex-direction: row;">
+  <table style="box-sizing: content-box; border: 10px solid green; background: green;
+                height: 50px; flex: 0 0 80px">
+    <caption style="height: 10px; border: 10px solid green; background: green;"></caption>
+  </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html
new file mode 100644
index 00000000000..04e168e52eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#valdef-align-items-stretch">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=799725">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The table's cross-axis (inline-size) is stretched while the main-axis is not growing.">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: flex; flex-direction: column; width: 100px; background: red;">
+  <table style="border-spacing: 0; height: 90px;">
+    <caption style="height: 10px; background: green;"></caption>
+    <td style="background: green;"></td>
+  </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html
new file mode 100644
index 00000000000..2728e024ee2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html
@@ -0,0 +1,55 @@
+
+<!DOCTYPE html>
+<html lang=en class="reftest-wait">
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Grid positioned item dynamic change</title>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="This test checks that descendant positioned items can be dynamically changed.">
+<style>
+.grid {
+  display: grid;
+  grid: 50px 50px / 50px 50px;
+  position: relative;
+}
+
+.green {
+  background: green;
+}
+
+.red {
+  background: red;
+}
+
+#item {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  grid-column: 1 / 2;
+  grid-row: 1 / 2;
+  top: 0;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="grid">
+  <div class="green"></div>
+  <div class="green">
+    <div id="item" class="green"></div>
+  </div>
+  <div class="green"></div>
+  <div class="red"></div>
+</div>
+
+<script>
+  document.body.offsetLeft;
+
+  var item = document.getElementById("item");
+  item.style.gridColumn = "2 / 3";
+  item.style.gridRow = "2 / 3";
+
+  document.documentElement.classList.remove('reftest-wait');
+</script>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html
new file mode 100644
index 00000000000..d6e8b7a4e50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-item-sizing">
+<meta name="assert" content="Checks that the %-padding accessed from script, for an OOF descendant resolves correctly.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('#target')">
+  <div style="display: inline-grid; position: relative; grid-template: 50px 20px / 50px 20px;">
+    <div style="grid-area: 2/2/2/2;">
+      <div id="target" style="position: absolute; top: 0; left: 0; grid-area: 1/1/1/1; padding: 100%; background: green;" data-expected-padding-left="50" data-expected-padding-top="50"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/input-text-crash.https.html b/tests/wpt/web-platform-tests/css/css-layout-api/input-text-crash.https.html
new file mode 100644
index 00000000000..2d32609040a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-layout-api/input-text-crash.https.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1181687">
+<input style="display:layout(success);">
diff --git a/tests/wpt/web-platform-tests/html/tools/build.sh b/tests/wpt/web-platform-tests/html/tools/build.sh
index a416d05dd4d..96875512162 100755
--- a/tests/wpt/web-platform-tests/html/tools/build.sh
+++ b/tests/wpt/web-platform-tests/html/tools/build.sh
@@ -2,7 +2,7 @@
 set -ex
 
 cd "${0%/*}"
-virtualenv -p python2 .virtualenv
+virtualenv -p python3 .virtualenv
 .virtualenv/bin/pip install genshi
 git clone https://github.com/html5lib/html5lib-python.git .virtualenv/html5lib && cd .virtualenv/html5lib || cd .virtualenv/html5lib && git pull
 # Pinned commit, to avoid html5lib from changing underneath us.
diff --git a/tests/wpt/web-platform-tests/html/tools/update_html5lib_tests.py b/tests/wpt/web-platform-tests/html/tools/update_html5lib_tests.py
index e4f339a6053..1ecce39f2af 100644
--- a/tests/wpt/web-platform-tests/html/tools/update_html5lib_tests.py
+++ b/tests/wpt/web-platform-tests/html/tools/update_html5lib_tests.py
@@ -56,7 +56,7 @@ def get_expected(data):
 def get_hash(data, container=None):
     if container == None:
         container = ""
-    return hashlib.sha1("#container%s#data%s"%(container.encode("utf8"),
+    return hashlib.sha1(b"#container%s#data%s"%(container.encode("utf8"),
                                                data.encode("utf8"))).hexdigest()
 
 def make_tests(script_dir, out_dir, input_file_name, test_data):
@@ -78,10 +78,10 @@ def make_tests(script_dir, out_dir, input_file_name, test_data):
             print("WARNING: id %s seen multiple times in file %s this time for test (%s, %s) before for test %s, skipping"%(test_id, input_file_name, container, data, ids_seen[test_id]))
             continue
         ids_seen[test_id] = (container, data)
-        test_list.append({'string_uri_encoded_input':"\"%s\""%urllib.quote(data.encode("utf8")),
+        test_list.append({'string_uri_encoded_input':"\"%s\""%urllib.parse.quote(data.encode("utf8")),
                           'input':data,
                           'expected':expected,
-                          'string_escaped_expected':json.dumps(urllib.quote(expected.encode("utf8"))),
+                          'string_escaped_expected':json.dumps(urllib.parse.quote(expected.encode("utf8"))),
                           'id':test_id,
                           'container':container
                           })
@@ -108,8 +108,8 @@ def write_test_file(script_dir, out_dir, tests, file_name, template_file_name):
     stream = template.generate(file_name=short_name, tests=tests)
 
     with open(file_name, "w") as f:
-        f.write(stream.render('html', doctype='html5',
-                              encoding="utf8"))
+        f.write(str(stream.render('html', doctype='html5',
+                              encoding="utf8"), "utf-8"))
     return file_name
 
 def escape_js_string(in_data):
@@ -126,15 +126,15 @@ def main():
     inner_html_files = []
 
     if len(sys.argv) > 2:
-        test_iterator = itertools.izip(
+        test_iterator = zip(
             itertools.repeat(False),
             sorted(os.path.abspath(item) for item in
                    glob.glob(os.path.join(sys.argv[2], "*.dat"))))
     else:
         test_iterator = itertools.chain(
-            itertools.izip(itertools.repeat(False),
+            zip(itertools.repeat(False),
                            sorted(support.get_data_files("tree-construction"))),
-            itertools.izip(itertools.repeat(True),
+            zip(itertools.repeat(True),
                            sorted(support.get_data_files(
                         os.path.join("tree-construction", "scripted")))))
 
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
index aac73db9eb7..96b232867f0 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
@@ -1,5 +1,7 @@
 <!DOCTYPE HTML>
 <title>auxclick is a PointerEvent</title>
+<meta name="variant" content="?mouse">
+<meta name="variant" content="?pen">
 <link rel="help" href="https://github.com/w3c/pointerevents/pull/317">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -14,6 +16,7 @@
 let target = document.getElementById("target");
 let pointerId = 0;
 let pointerType = "";
+let inputSource = location.search.substring(1);
 
 target.addEventListener("pointerdown", (e)=>{
   pointerId = e.pointerId;
@@ -50,7 +53,6 @@ function run_test(pointerType){
   }), "auxclick using " + pointerType + " is a PointerEvent");
 }
 
-run_test("mouse");
-run_test("pen");
+run_test(inputSource);
 // TODO(crbug.com/1150441): Add test for auxclick from touch.Note: Calling run_test("touch") here times out.
 </script>
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/getScreens.tentative.https.window.js b/tests/wpt/web-platform-tests/screen_enumeration/getScreens.tentative.https.window.js
index acd38bb03b2..a4d6ec0465a 100644
--- a/tests/wpt/web-platform-tests/screen_enumeration/getScreens.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/screen_enumeration/getScreens.tentative.https.window.js
@@ -9,8 +9,10 @@ promise_test(async t => {
 
 promise_test(async t => {
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
-  const screens = await self.getScreens();
+  const screensInterface = await self.getScreens();
+  const screens = screensInterface.screens;
   assert_greater_than(screens.length, 0);
+  assert_true(screens.includes(screensInterface.currentScreen));
 
   assert_equals(typeof screens[0].availWidth, 'number');
   assert_equals(typeof screens[0].availHeight, 'number');
@@ -25,16 +27,18 @@ promise_test(async t => {
   assert_equals(typeof screens[0].top, 'number');
   assert_equals(typeof screens[0].orientation, 'object');
 
-  assert_equals(typeof screens[0].primary, 'boolean');
-  assert_equals(typeof screens[0].internal, 'boolean');
-  assert_equals(typeof screens[0].scaleFactor, 'number');
+  assert_equals(typeof screens[0].isExtended, 'boolean');
+  assert_equals(typeof screens[0].isPrimary, 'boolean');
+  assert_equals(typeof screens[0].isInternal, 'boolean');
+  assert_equals(typeof screens[0].devicePixelRatio, 'number');
   assert_equals(typeof screens[0].id, 'string');
-  assert_equals(typeof screens[0].touchSupport, 'boolean');
+  assert_equals(typeof screens[0].pointerTypes, 'object');
+  assert_equals(typeof screens[0].label, 'string');
 }, 'getScreens() returns at least 1 Screen with permission granted');
 
 promise_test(async t => {
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
-  assert_greater_than((await self.getScreens()).length, 0);
+  assert_greater_than((await self.getScreens()).screens.length, 0);
   await test_driver.set_permission({name: 'window-placement'}, 'denied');
   await promise_rejects_dom(t, 'NotAllowedError', self.getScreens());
 }, 'getScreens() rejects the promise with permission denied');
@@ -42,7 +46,7 @@ promise_test(async t => {
 promise_test(async t => {
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
   let iframe = document.body.appendChild(document.createElement('iframe'));
-  assert_greater_than((await iframe.contentWindow.getScreens()).length, 0);
+  assert_greater_than((await iframe.contentWindow.getScreens()).screens.length, 0);
 
   let iframeGetScreens;
   let constructor;
@@ -62,3 +66,16 @@ promise_test(async t => {
   assert_equals(iframe.contentWindow, null);
   await promise_rejects_dom(t, 'InvalidStateError', constructor, iframeGetScreens());
 }, "getScreens() resolves for attached iframe; rejects for detached iframe");
+
+promise_test(async t => {
+  await test_driver.set_permission({name: 'window-placement'}, 'granted');
+  let iframe = document.body.appendChild(document.createElement('iframe'));
+  const screensInterface = await iframe.contentWindow.getScreens();
+  assert_greater_than(screensInterface.screens.length, 0);
+  assert_equals(screensInterface.currentScreen, screensInterface.screens[0]);
+  iframe.remove();
+  await t.step_wait(() => !iframe.contentWindow, "execution context invalid");
+  assert_equals(iframe.contentWindow, null);
+  assert_equals(screensInterface.screens.length, 0);
+  assert_equals(screensInterface.currentScreen, null);
+}, "Cached Screens interface from detached iframe doesn't crash, behaves okay");
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html b/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html
index 93b27b46556..b29ff5ab309 100644
--- a/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html
+++ b/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset='utf-8'>
-<title>Window Placement: getScreens() tentative</title>
+<title>Window Placement: getScreensDeprecated() tentative</title>
 <!-- TODO: update link to W3C whenever specifications are ready -->
 <link rel='help' href='https://github.com/webscreens/window-placement'/>
 <script src='/resources/testharness.js'></script>
@@ -25,8 +25,8 @@ function check_screen_matches_display(screen, display) {
 screen_enumeration_test(async (t, mockScreenEnum) => {
   mockScreenEnum.setSuccess(true);
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
-  assert_equals((await self.getScreens()).length, 0);
-}, 'getScreens() supports an empty set of mocked screens');
+  assert_equals((await self.getScreensDeprecated()).length, 0);
+}, 'getScreensDeprecated() supports an empty set of mocked screens');
 
 screen_enumeration_test(async (t, mockScreenEnum) => {
   let display1 = makeDisplay(10,
@@ -41,13 +41,13 @@ screen_enumeration_test(async (t, mockScreenEnum) => {
 
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
 
-  const screens = await self.getScreens();
+  const screens = await self.getScreensDeprecated();
   assert_equals(screens.length, 1);
   check_screen_matches_display(screens[0], display1);
   assert_equals(screens[0].primary, true);
   assert_equals(screens[0].internal, true);
   assert_equals(screens[0].id, '0');
-}, 'getScreens() supports a single mocked screen');
+}, 'getScreensDeprecated() supports a single mocked screen');
 
 screen_enumeration_test(async (t, mockScreenEnum) => {
   let display1 = makeDisplay(10,
@@ -74,7 +74,7 @@ screen_enumeration_test(async (t, mockScreenEnum) => {
 
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
 
-  let screens = await self.getScreens();
+  let screens = await self.getScreensDeprecated();
   assert_equals(screens.length, 3);
   check_screen_matches_display(screens[0], display1);
   assert_equals(screens[0].primary, true);
@@ -90,7 +90,7 @@ screen_enumeration_test(async (t, mockScreenEnum) => {
   assert_equals(screens[2].id, '2');
 
   mockScreenEnum.removeDisplay(display2.id);
-  screens = await self.getScreens();
+  screens = await self.getScreensDeprecated();
   assert_equals(screens.length, 2);
   check_screen_matches_display(screens[0], display1);
   assert_equals(screens[0].id, '0');
@@ -98,16 +98,16 @@ screen_enumeration_test(async (t, mockScreenEnum) => {
   assert_equals(screens[1].id, '1');
 
   mockScreenEnum.removeDisplay(display1.id);
-  screens = await self.getScreens();
+  screens = await self.getScreensDeprecated();
   assert_equals(screens.length, 1);
   check_screen_matches_display(screens[0], display3);
   assert_equals(screens[0].id, '0');
-}, 'getScreens() supports multiple mocked screens');
+}, 'getScreensDeprecated() supports multiple mocked screens');
 
 screen_enumeration_test(async (t, mockScreenEnum) => {
   mockScreenEnum.setSuccess(false);
   await test_driver.set_permission({name: 'window-placement'}, 'granted');
-  promise_rejects_dom(t, 'NotAllowedError', self.getScreens());
-}, 'getScreens() rejects when the mock success value is set to false');
+  promise_rejects_dom(t, 'NotAllowedError', self.getScreensDeprecated());
+}, 'getScreensDeprecated() rejects when the mock success value is set false');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 83a883b98b5..3a4229841f8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -196,7 +196,8 @@ def run_info_extras(**kwargs):
           "fission": kwargs.get("enable_fission") or get_bool_pref("fission.autostart"),
           "sessionHistoryInParent": (kwargs.get("enable_fission") or
                                      get_bool_pref("fission.autostart") or
-                                     get_bool_pref("fission.sessionHistoryInParent"))}
+                                     get_bool_pref("fission.sessionHistoryInParent")),
+          "swgl": get_bool_pref("gfx.webrender.software")}
 
     # The value of `sw-e10s` defaults to whether the "parent_intercept"
     # implementation is enabled for the current build. This value, however,
@@ -226,7 +227,7 @@ def run_info_browser_version(**kwargs):
 
 
 def update_properties():
-    return (["os", "debug", "webrender", "fission", "e10s", "sw-e10s", "processor"],
+    return (["os", "debug", "webrender", "fission", "e10s", "sw-e10s", "processor", "swgl"],
             {"os": ["version"], "processor": ["bits"]})
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
index 1a007cda5b4..cfa86f993aa 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
@@ -478,14 +478,19 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
         try:
             handshaker.do_handshake()
         except HandshakeException as e:
-            self.logger.info('Handshake failed for error: %s', e)
+            self.logger.info('Handshake failed for error: %s' % e)
             h2response.set_error(e.status)
             h2response.write()
             return
 
         # h2 Handshaker prepares the headers but does not send them down the
         # wire. Flush the headers here.
-        h2response.write_status_headers()
+        try:
+            h2response.write_status_headers()
+        except StreamClosedError:
+            # work around https://github.com/web-platform-tests/wpt/issues/27786
+            # The stream was already closed.
+            return
 
         request_wrapper._dispatcher = dispatcher
 
@@ -518,7 +523,13 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler):
 
     def _stream_ws_sub_thread(self, request, stream_handler, queue):
         dispatcher = request._dispatcher
-        dispatcher.transfer_data(request)
+        try:
+            dispatcher.transfer_data(request)
+        except StreamClosedError:
+            # work around https://github.com/web-platform-tests/wpt/issues/27786
+            # The stream was already closed.
+            queue.put(None)
+            return
 
         stream_id = stream_handler.h2_stream_id
         with stream_handler.conn as connection:
diff --git a/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions-manual.html b/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.html
similarity index 89%
rename from tests/wpt/web-platform-tests/touch-events/multi-touch-interactions-manual.html
rename to tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.html
index 45e53af0ee9..a10416bdfd4 100644
--- a/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions-manual.html
+++ b/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.html
@@ -19,6 +19,9 @@
 <meta name="viewport" content="width=device-width">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src="multi-touch-interactions.js"></script>
 <style>
     div {
diff --git a/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.js b/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.js
index 7a8a6b21646..9faf63c0ad8 100644
--- a/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.js
+++ b/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.js
@@ -67,7 +67,7 @@ function check_starting_elements(list) {
     }
 }
 
-function run() {
+async function run() {
     var target0 = document.getElementById("target0");
     var target1 = document.getElementById("target1");
 
@@ -368,4 +368,23 @@ function run() {
             done();
         }
     });
+
+    await new test_driver.Actions()
+          .addPointer("touchPointer1", "touch")
+          .addPointer("touchPointer2", "touch")
+          .addPointer("touchPointer3", "touch")
+          .pointerMove(0, 0, {origin: target0, sourceName: "touchPointer1"})
+          .pointerMove(3, 0, {origin: target0, sourceName: "touchPointer2"})
+          .pointerDown({sourceName: "touchPointer1"})
+          .pointerDown({sourceName: "touchPointer2"})
+          .pointerMove(0, 10, {origin: target0, sourceName: "touchPointer1"})
+          .pointerMove(3, 10, {origin: target0, sourceName: "touchPointer2"})
+          .pointerMove(0, 0, {origin: target1, sourceName: "touchPointer1"})
+          .pointerMove(3, 0, {origin: target1, sourceName: "touchPointer2"})
+          .pointerMove(6, 0, {origin: target0, sourceName: "touchPointer3"})
+          .pointerDown({sourceName: "touchPointer3"})
+          .pointerUp({sourceName: "touchPointer1"})
+          .pointerUp({sourceName: "touchPointer2"})
+          .pointerUp({sourceName: "touchPointer3"})
+          .send();
 }
diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json b/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
index a4b2c3281f0..9e7fe20005b 100644
--- a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
+++ b/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json
@@ -788,6 +788,174 @@
     "pattern": { "hash": "(café)" },
     "error": true
   },
+  {
+    "pattern": { "protocol": ":café" },
+    "input": { "protocol": "foo" },
+    "expected": {
+      "input": { "protocol": "foo" },
+      "protocol": { "input": "foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "username": ":café" },
+    "input": { "username": "foo" },
+    "expected": {
+      "input": { "username": "foo" },
+      "username": { "input": "foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "password": ":café" },
+    "input": { "password": "foo" },
+    "expected": {
+      "input": { "password": "foo" },
+      "password": { "input": "foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "hostname": ":café" },
+    "input": { "hostname": "foo" },
+    "expected": {
+      "input": { "hostname": "foo" },
+      "hostname": { "input": "foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "pathname": "/:café" },
+    "input": { "pathname": "/foo" },
+    "expected": {
+      "input": { "pathname": "/foo" },
+      "pathname": { "input": "/foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "search": ":café" },
+    "input": { "search": "foo" },
+    "expected": {
+      "input": { "search": "foo" },
+      "search": { "input": "foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "hash": ":café" },
+    "input": { "hash": "foo" },
+    "expected": {
+      "input": { "hash": "foo" },
+      "hash": { "input": "foo", "groups": { "café": "foo" } }
+    }
+  },
+  {
+    "pattern": { "protocol": ":\u2118" },
+    "input": { "protocol": "foo" },
+    "expected": {
+      "input": { "protocol": "foo" },
+      "protocol": { "input": "foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "username": ":\u2118" },
+    "input": { "username": "foo" },
+    "expected": {
+      "input": { "username": "foo" },
+      "username": { "input": "foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "password": ":\u2118" },
+    "input": { "password": "foo" },
+    "expected": {
+      "input": { "password": "foo" },
+      "password": { "input": "foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "hostname": ":\u2118" },
+    "input": { "hostname": "foo" },
+    "expected": {
+      "input": { "hostname": "foo" },
+      "hostname": { "input": "foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "pathname": "/:\u2118" },
+    "input": { "pathname": "/foo" },
+    "expected": {
+      "input": { "pathname": "/foo" },
+      "pathname": { "input": "/foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "search": ":\u2118" },
+    "input": { "search": "foo" },
+    "expected": {
+      "input": { "search": "foo" },
+      "search": { "input": "foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "hash": ":\u2118" },
+    "input": { "hash": "foo" },
+    "expected": {
+      "input": { "hash": "foo" },
+      "hash": { "input": "foo", "groups": { "\u2118": "foo" } }
+    }
+  },
+  {
+    "pattern": { "protocol": ":\u3400" },
+    "input": { "protocol": "foo" },
+    "expected": {
+      "input": { "protocol": "foo" },
+      "protocol": { "input": "foo", "groups": { "\u3400": "foo" } }
+    }
+  },
+  {
+    "pattern": { "username": ":\u3400" },
+    "input": { "username": "foo" },
+    "expected": {
+      "input": { "username": "foo" },
+      "username": { "input": "foo", "groups": { "\u3400": "foo" } }
+    }
+  },
+  {
+    "pattern": { "password": ":\u3400" },
+    "input": { "password": "foo" },
+    "expected": {
+      "input": { "password": "foo" },
+      "password": { "input": "foo", "groups": { "\u3400": "foo" } }
+    }
+  },
+  {
+    "pattern": { "hostname": ":\u3400" },
+    "input": { "hostname": "foo" },
+    "expected": {
+      "input": { "hostname": "foo" },
+      "hostname": { "input": "foo", "groups": { "\u3400": "foo" } }
+    }
+  },
+  {
+    "pattern": { "pathname": "/:\u3400" },
+    "input": { "pathname": "/foo" },
+    "expected": {
+      "input": { "pathname": "/foo" },
+      "pathname": { "input": "/foo", "groups": { "\u3400": "foo" } }
+    }
+  },
+  {
+    "pattern": { "search": ":\u3400" },
+    "input": { "search": "foo" },
+    "expected": {
+      "input": { "search": "foo" },
+      "search": { "input": "foo", "groups": { "\u3400": "foo" } }
+    }
+  },
+  {
+    "pattern": { "hash": ":\u3400" },
+    "input": { "hash": "foo" },
+    "expected": {
+      "input": { "hash": "foo" },
+      "hash": { "input": "foo", "groups": { "\u3400": "foo" } }
+    }
+  },
   {
     "pattern": { "protocol": "(.*)" },
     "input": { "protocol" : "café" },
diff --git a/tests/wpt/web-platform-tests/webrtc-ice/META.yml b/tests/wpt/web-platform-tests/webrtc-ice/META.yml
new file mode 100644
index 00000000000..e683349e3cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-ice/META.yml
@@ -0,0 +1,3 @@
+spec: https://w3c.github.io/webrtc-ice/
+suggested_reviewers:
+  - alvestrand
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport-extension-helper.js b/tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension-helper.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webrtc/RTCIceTransport-extension-helper.js
rename to tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension-helper.js
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport-extension.https.html b/tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/webrtc/RTCIceTransport-extension.https.html
rename to tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension.https.html
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index 0a0a7fb91e6..8bf855fa00e 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -302,3 +302,6 @@
   [WebGL test #49: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,2,0,0]
     expected: FAIL
 
+  [WebGL test #52: attachment 7 should be 0,255,0,255\nat (4, 0) expected: 0,255,0,255 was 0,255,0,0]
+    expected: FAIL
+