diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
deleted file mode 100644
index 0842d0b5727..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-001.html]
-  [hit-test-floats-001]
-    expected: FAIL
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..968f62a2553
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..147f062e548
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
new file mode 100644
index 00000000000..b4eea326212
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-001.html]
+  [block-in-inline-hittest-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index 51432362d66..ee34bc91078 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,3 +1,6 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
+
+  [elementFromPoint]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
index f9e216a8cfc..cdd8b55f192 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-relpos-zindex.html]
   [position: relative; z-index: -1;]
     expected: FAIL
-
-  [block-in-inline-hittest-relpos-zindex]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
new file mode 100644
index 00000000000..5b685485f3c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
@@ -0,0 +1,3 @@
+[hittest-before-pseudo.html]
+  [Hit-testing text within a pseudo-element flex-item should return the flexbox as the hittest result.]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
index fc4036a6d2d..7109a1f8ae1 100644
--- a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -119,15 +119,9 @@
   [Matching font-stretch: '90%' should prefer '50% 80%' over '60% 70%']
     expected: FAIL
 
-  [Matching font-stretch: '90%' should prefer '60% 70%' over '110% 140%']
-    expected: FAIL
-
   [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
     expected: FAIL
 
-  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'oblique 0deg' over 'oblique 10deg 40deg']
     expected: FAIL
 
@@ -149,9 +143,6 @@
   [Matching font-style: 'italic' should prefer 'oblique 40deg 50deg' over 'oblique 5deg 10deg']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 5deg 10deg' over 'oblique 5deg']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'normal' over 'oblique 0deg']
     expected: FAIL
 
@@ -269,9 +260,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -10deg' over 'italic']
     expected: FAIL
 
-  [Matching font-style: 'oblique -20deg' should prefer 'italic' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -20deg' should prefer 'oblique 0deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
@@ -317,8 +305,8 @@
   [Matching font-weight: '399' should prefer '200 300' over '400']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 5deg' over 'normal']
-    expected: FAIL
-
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -1deg 0deg' over 'oblique -20deg -15deg']
     expected: FAIL
+
+  [Matching font-weight: '501' should prefer '503 520' over '500']
+    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 e647155e783..180652f75d4 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
@@ -53,306 +53,6 @@
   [background-position length(px) / events]
     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
-
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
   [background-color color(rgba) / values]
     expected: FAIL
 
@@ -476,152 +176,152 @@
   [padding-bottom length(em) / values]
     expected: FAIL
 
-  [max-height length(ex) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [max-height length(mm) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [max-height length(cm) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [max-height length(in) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [max-height percentage(%) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [max-width length(pt) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [max-width length(pc) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [max-width length(px) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [max-width length(em) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [max-width length(ex) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [max-width length(mm) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [max-width length(cm) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [max-width length(in) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [max-width percentage(%) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [top length(pt) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [top length(pc) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [top length(px) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [top length(em) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [top length(ex) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [top length(mm) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [top length(cm) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [top length(in) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [top percentage(%) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [right length(pt) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [right length(pc) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [right length(px) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [right length(em) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [right length(ex) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [right length(mm) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [right length(cm) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [right length(in) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [right percentage(%) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [bottom length(pt) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [bottom length(pc) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [bottom length(px) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [bottom length(em) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [bottom length(ex) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [bottom length(mm) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [bottom length(cm) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [bottom length(in) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [bottom percentage(%) / values]
+  [text-indent length(pt) / values]
     expected: FAIL
 
-  [left length(pt) / values]
+  [text-indent length(pc) / values]
     expected: FAIL
 
-  [left length(pc) / values]
+  [text-indent length(px) / values]
     expected: FAIL
 
-  [left length(px) / values]
+  [text-indent length(em) / values]
     expected: FAIL
 
-  [left length(em) / values]
+  [text-indent length(ex) / values]
     expected: FAIL
 
-  [left length(ex) / values]
+  [text-indent length(mm) / values]
     expected: FAIL
 
-  [left length(mm) / values]
+  [text-indent length(cm) / values]
     expected: FAIL
 
-  [left length(cm) / values]
+  [text-indent length(in) / values]
     expected: FAIL
 
-  [left length(in) / values]
+  [text-indent percentage(%) / values]
     expected: FAIL
 
-  [left percentage(%) / values]
+  [text-shadow shadow(shadow) / values]
     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 d105a77b1ee..e87f8c08864 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
@@ -55,603 +55,3 @@
 
   [background-position length(px) / 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
-
-  [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
-
-  [margin-right length(cm) / events]
-    expected: FAIL
-
-  [margin-right length(in) / events]
-    expected: FAIL
-
-  [margin-top length(pt) / events]
-    expected: FAIL
-
-  [margin-top length(pc) / events]
-    expected: FAIL
-
-  [margin-top length(px) / events]
-    expected: FAIL
-
-  [margin-top length(em) / events]
-    expected: FAIL
-
-  [margin-top length(ex) / events]
-    expected: FAIL
-
-  [margin-top length(mm) / events]
-    expected: FAIL
-
-  [margin-top length(cm) / events]
-    expected: FAIL
-
-  [margin-top length(in) / events]
-    expected: FAIL
-
-  [height length(pt) / events]
-    expected: FAIL
-
-  [height length(pc) / events]
-    expected: FAIL
-
-  [height length(px) / events]
-    expected: FAIL
-
-  [height length(em) / events]
-    expected: FAIL
-
-  [height length(ex) / events]
-    expected: FAIL
-
-  [height length(mm) / events]
-    expected: FAIL
-
-  [height length(cm) / events]
-    expected: FAIL
-
-  [height length(in) / events]
-    expected: FAIL
-
-  [height percentage(%) / events]
-    expected: FAIL
-
-  [width length(pt) / events]
-    expected: FAIL
-
-  [width length(pc) / events]
-    expected: FAIL
-
-  [width length(px) / events]
-    expected: FAIL
-
-  [width length(em) / events]
-    expected: FAIL
-
-  [width length(ex) / events]
-    expected: FAIL
-
-  [width length(mm) / events]
-    expected: FAIL
-
-  [width length(cm) / events]
-    expected: FAIL
-
-  [width length(in) / events]
-    expected: FAIL
-
-  [width percentage(%) / events]
-    expected: FAIL
-
-  [min-height length(pt) / events]
-    expected: FAIL
-
-  [min-height length(pc) / events]
-    expected: FAIL
-
-  [min-height length(px) / events]
-    expected: FAIL
-
-  [min-height length(em) / events]
-    expected: FAIL
-
-  [min-height length(ex) / events]
-    expected: FAIL
-
-  [min-height length(mm) / events]
-    expected: FAIL
-
-  [min-height length(cm) / events]
-    expected: FAIL
-
-  [min-height length(in) / events]
-    expected: FAIL
-
-  [min-height percentage(%) / events]
-    expected: FAIL
-
-  [min-width length(pt) / events]
-    expected: FAIL
-
-  [min-width length(pc) / events]
-    expected: FAIL
-
-  [min-width length(px) / events]
-    expected: FAIL
-
-  [min-width length(em) / events]
-    expected: FAIL
-
-  [min-width length(ex) / events]
-    expected: FAIL
-
-  [min-width length(mm) / events]
-    expected: FAIL
-
-  [min-width length(cm) / events]
-    expected: FAIL
-
-  [min-width length(in) / events]
-    expected: FAIL
-
-  [min-width percentage(%) / events]
-    expected: FAIL
-
-  [max-height length(pt) / events]
-    expected: FAIL
-
-  [max-height length(pc) / events]
-    expected: FAIL
-
-  [max-height length(px) / events]
-    expected: FAIL
-
-  [max-height length(em) / 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
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 b369cf511b1..242ba44bbca 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
@@ -52,426 +52,3 @@
 
   [background-position length(px) / events]
     expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    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-layout-2020/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
new file mode 100644
index 00000000000..cf67b5d03dd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-dynamic-anon-box.html]
+  [Link should be clickable after hiding a scrollbox with an anonymous table inside]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
deleted file mode 100644
index 7e9331b6bc2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-float-in-relative.html]
-  [elementFromPoint-float-in-relative]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-table.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-table.html.ini
new file mode 100644
index 00000000000..db065588308
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-table.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-table.html]
+  [float-in-div]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
index 1f892861935..d701934cf73 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -13,3 +13,12 @@
 
   [<li>Outside 1</li>]
     expected: FAIL
+
+  [<li>Inside 2</li>]
+    expected: FAIL
+
+  [<li>Inside 3</li>]
+    expected: FAIL
+
+  [<li>Image Inside 1</li>]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
new file mode 100644
index 00000000000..a6bca7ac372
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-visibility-hidden-resizer.html]
+  [elementFromPoint on resizer area of an element with visibility:hidden]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
index e0663d34a38..ac656410273 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
@@ -79,3 +79,6 @@
 
   [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
     expected: FAIL
+
+  [Input: "Content-Length: 30". Expected: 30.]
+    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 5e36e8dcc7b..8edde75f4d0 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
@@ -308,6 +308,3 @@
 
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 067368ac95d..8ffb8d9df59 100644
--- a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -147,5 +147,8 @@
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
 
-  [background-image sec-fetch-site - Not sent to non-trustworthy cross-site destination]
+  [border-image sec-fetch-site - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 736ff6130a5..ee87a7bd32f 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -7,3 +7,9 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
+
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
+  [Content-Type-Options%3A%20nosniff]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
new file mode 100644
index 00000000000..1f528be38ef
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
@@ -0,0 +1,4 @@
+[scroll-restoration-fragment-scrolling-cross-origin.html]
+  expected: ERROR
+  [Manual scroll restoration should take precedent over scrolling to fragment in cross origin navigation]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 856bb1c9901..dc1144214ef 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,10 +1,9 @@
 [iframe-src-aboutblank-navigate-immediately.html]
-  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Navigating to a different document with link click]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 324db3d9b35..5aef7ce66ce 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,3 +10,6 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
+
+  [load event does not fire on window.open('about:blank')]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini
index 27889a98fb5..9eb22957864 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini
@@ -1,6 +1,7 @@
 [navigate-to-unparseable-url.html]
+  expected: TIMEOUT
   [location.href setter throws a SyntaxError DOMException for unparseable URLs]
-    expected: FAIL
+    expected: TIMEOUT
 
   [<a> tag navigate fails for unparseable URLs]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
deleted file mode 100644
index 7dc346632a4..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-same-origin.window.html]
-  [Same-origin navigation started from unload handler must be ignored]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
deleted file mode 100644
index 60a4fa51f8a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-click.html]
-  [aElement.click() before the load event must NOT replace]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
index 6c777ea167c..e84cccbbd1f 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
@@ -1,4 +1,3 @@
 [form-submit-button-click.html]
-  expected: TIMEOUT
   [Replace before load, triggered by submitButton.click()]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
deleted file mode 100644
index f5b7b25324f..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse-during-unload.html]
-  expected: TIMEOUT
-  [Traversing the history during unload]
-    expected: TIMEOUT
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
deleted file mode 100644
index ba0aed26689..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html.ini
new file mode 100644
index 00000000000..de713daa8a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html.ini
@@ -0,0 +1,3 @@
+[navigate-to-about-blank-while-initial-load-pending.html]
+  [Navigating to about:blank while window.open initial load pending.]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 24903b5f66f..7d28d586f51 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_escaping-1.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_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 841bafc6eca..26704422bbe 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,3 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    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 dcd52d2fee8..90317c9bf28 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,12 +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: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
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
deleted file mode 100644
index b8bdf33cb65..00000000000
--- a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[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-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..53acb938c1b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,3 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index d08018b0ee2..91102337ffa 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -313505,7 +313505,7 @@
     }
    },
    ".gitignore": [
-    "d5b2da49defe7c32871d8e17605caa820d994e19",
+    "4f85ad3c52367e52f4b9d6c3a2bc24a49361da5b",
     []
    ],
    ".mailmap": [
@@ -438991,260 +438991,6 @@
         []
        ]
       }
-     },
-     "submissions": {
-      "Microsoft": {
-       "CompositionEvent.html": [
-        "0f8242b07d5aec992e14cea6b046ddbaa1c521f2",
-        []
-       ],
-       "DOMAttrModified.attrChange.html": [
-        "12c45fc848e6c86483cee19babc0b9351aac298f",
-        []
-       ],
-       "DOMAttrModified.attrName.html": [
-        "ca1ad97d24dbad89c54dbfb12cc0ff8f54d25b18",
-        []
-       ],
-       "DOMAttrModified.html": [
-        "c229abe96e3294a720bc04f82456f6c6b60b720c",
-        []
-       ],
-       "DOMAttrModified.newValue.html": [
-        "77b8a41e1a35499cdc4a37ff05b57fad054f7e9a",
-        []
-       ],
-       "DOMAttrModified.prevValue.html": [
-        "31fbec77644391fdcae9d6e6c96e7c144d1b448d",
-        []
-       ],
-       "DOMAttrModified.relatedNode.html": [
-        "5c30dabe22fd110f4540d8a7e6e97e2e0a3425bc",
-        []
-       ],
-       "DOMCharacterDataModified.html": [
-        "31d4fbf08f31f3b776ae970fc33f1285cd9f1ffe",
-        []
-       ],
-       "DOMNodeInserted.html": [
-        "0e0d26d1aaece67a685021b07e97edbc6db3e81c",
-        []
-       ],
-       "DOMNodeRemoved.html": [
-        "34d7112027c32bdac32b37aface0c89c659d50be",
-        []
-       ],
-       "DOMSubtreeModified.html": [
-        "1819f563dacd442ed07eb9ef2d69e4732533b36f",
-        []
-       ],
-       "Event.defaultPrevented.html": [
-        "8acd3cb979f4286affde5556b6d74c7a278b80d5",
-        []
-       ],
-       "Event.eventPhase.html": [
-        "4bd3b51b46c3527ce4a961a90dea53582e22fddd",
-        []
-       ],
-       "Event.stopPropagation.html": [
-        "019143e366c87215ca38ba21613e41280532f835",
-        []
-       ],
-       "KeyboardEvent.key.html": [
-        "ea1adb0751f129637391d007c9cfeb6460ec8d5d",
-        []
-       ],
-       "KeyboardEvent.location.html": [
-        "63fe460f3d3f986a5cd70e42eda9a6e090e77dc7",
-        []
-       ],
-       "KeyboardEvent.modifiers.html": [
-        "ee490b47ec6745351e295dd0a28a89f86eb615df",
-        []
-       ],
-       "MouseEvent.button.html": [
-        "605565a7814e00eea908d47d0eab7df683c53228",
-        []
-       ],
-       "MouseEvent.image.map.area.html": [
-        "17b7dd5ccee436e6241d773728611b2e9efa3b72",
-        []
-       ],
-       "MouseEvent.preventDefault.html": [
-        "e6cb57806db7cd4233d7a0a832d0e17d1238ac27",
-        []
-       ],
-       "MutationEvent.hasFeature.html": [
-        "f550a5366df2099f510d7b9f3281d9169c7bc721",
-        []
-       ],
-       "MutationEvent.initMutationEvent.html": [
-        "3b2bceabf45ea60d1f84977ea63fd0a44adc998e",
-        []
-       ],
-       "MutationEvent.relatedNode.html": [
-        "6b92079ef618ca62850c9795621d99cde51bc049",
-        []
-       ],
-       "ProcessingInstruction.DOMCharacterDataModified.fail.html": [
-        "9b0843c115ee1b5f93450982dd9065b0b8abb4af",
-        []
-       ],
-       "ProcessingInstruction.DOMCharacterDataModified.xml": [
-        "34ad59064ffb9147e211df34c056ebf927e89432",
-        []
-       ],
-       "TextEvent.hasFeature.html": [
-        "853cc7c43572f0e79389ce69da30c809b59b7daa",
-        []
-       ],
-       "TextEvent.initTextEvent.html": [
-        "52eae11aa9cffc077528e3354e353c20263ebd7d",
-        []
-       ],
-       "TextEvent.inputMode.IME.html": [
-        "af5c73624267ca9372077e5063e967a88068fd8d",
-        []
-       ],
-       "TextEvent.inputMode.drop.html": [
-        "14ffc19765bb9e4cc5772a32ac4f665152d8d86d",
-        []
-       ],
-       "TextEvent.inputMode.keyboard.html": [
-        "472dd96ddb8548c7c82c3d5f83c2772a7e6bfad5",
-        []
-       ],
-       "TextEvent.inputMode.paste.html": [
-        "a93259cd60892be6aa34e1f2d32725fd2f01a2a9",
-        []
-       ],
-       "TextEvent.inputMode.script.html": [
-        "c1327ebae57ada70477c7a721eb38df0cf8f597f",
-        []
-       ],
-       "UIEvent.load.stylesheet.html": [
-        "a948a2f71a4905e181698710e598d806b7e0a4c9",
-        []
-       ],
-       "WheelEvent.Capture.Bubble.html": [
-        "4dfe246136af7e0d12db94c9ce122becfca4a958",
-        []
-       ],
-       "WheelEvent.ctrlKey.zoom.html": [
-        "52b17ced96cd8e122f8ac5fee412b1da8ebbba02",
-        []
-       ],
-       "WheelEvent.deltaMode.html": [
-        "11761f4083d286097321309fd195bfa55ebff5e5",
-        []
-       ],
-       "WheelEvent.hasFeature.html": [
-        "8bd224fa98eefd6f29dfd6b101f0f53f93acff61",
-        []
-       ],
-       "WheelEvent.initWheelEvent.html": [
-        "cd8c192e41b21b68ee750e456b2db0fa289706b9",
-        []
-       ],
-       "WheelEvent.preventDefault.scroll.html": [
-        "6cb55a071f3f79f12d67c254dcc8c1f6cba14727",
-        []
-       ],
-       "abort.img.html": [
-        "c0fb1eaf97d8fbebe691218aa5e57d895ca4c5dd",
-        []
-       ],
-       "abort.testresult.html": [
-        "e0f6243b8acf5de965ab53fefa1c56f9293abb12",
-        []
-       ],
-       "blur.html": [
-        "cef282bfe5963fafe75f9dc8dda98d31f308d9b2",
-        []
-       ],
-       "compositionstart.data.html": [
-        "177c37e8d768bccaa8a09b7458d32719a3c0c04b",
-        []
-       ],
-       "compositionstart.keydown.html": [
-        "7316d1a8a30e6be7af4fabdedc24008a22875fea",
-        []
-       ],
-       "compositionstart.preventDefault.html": [
-        "74fc52b57990c63808b160cac154a88c79217612",
-        []
-       ],
-       "converted": {
-        "support": {
-         "ProcessingInstruction.DOMCharacterDataModified.xml": [
-          "4c95ae29dff774960c2d7d69ccfb7c2ecc3056cf",
-          []
-         ]
-        }
-       },
-       "dispatchEvent.click.checkbox.html": [
-        "757bb126460ba499a1dfdcd98f32bcd480c8f956",
-        []
-       ],
-       "error.image.html": [
-        "a629652d4f7c541600df9c7041960e920e71fe8f",
-        []
-       ],
-       "focusin.html": [
-        "a6eb1b663801bab4f522994a44fb60a399dfb2a0",
-        []
-       ],
-       "focusin.relatedTarget.html": [
-        "a36d254666dc00385c1ab8653dce93fbfe5e97c8",
-        []
-       ],
-       "focusout.relatedTarget.html": [
-        "bc02267ed7a13ae223605b67bd72a49e50ec09e6",
-        []
-       ],
-       "hasFeature.Events.html": [
-        "e0c9ba18d82f2a952f6ee813c4e8fb6a4f02f2da",
-        []
-       ],
-       "hasFeature.feature.string.html": [
-        "e96c39c8556e3fae603a9f25e9370fda6fad2eac",
-        []
-       ],
-       "load.image.html": [
-        "19414eaf022747f9fce17130a66c80adb15be7e1",
-        []
-       ],
-       "mouseenter.ctrlKey.html": [
-        "dac16046cf90a2fd02e7292a94a7554579f2ebb5",
-        []
-       ],
-       "mouseenter.relatedTarget.html": [
-        "f2d449dae85778c06d3d83f636a188cf2299a283",
-        []
-       ],
-       "mouseleave.relatedTarget.html": [
-        "37ca7197507aac95d1950e56a575bee5da314acd",
-        []
-       ],
-       "support": {
-        "16kb.js": [
-         "fb3c0d64b15ea7d764fa87e1eb0c1aef56ef8e75",
-         []
-        ],
-        "InvalidBitMap.png": [
-         "0a15a8e10d8dcce5fc3cf33ee9079d63b25e47f4",
-         []
-        ],
-        "iepreview.png": [
-         "63959a05626aa3225f963570ec4a54631efca19e",
-         []
-        ],
-        "style01.css": [
-         "961757bf3da5cb22fb389a02d2d8b9713772e637",
-         []
-        ]
-       }
-      }
      }
     },
     "mouse": {
@@ -654861,19 +654607,6 @@
         {}
        ]
       ]
-     },
-     "submissions": {
-      "Microsoft": {
-       "converted": {
-        "EventListener.dispatch.new.event.html": [
-         "e0ab7e0d3e417cd4595d7590d9d12d6d25bbc366",
-         [
-          null,
-          {}
-         ]
-        ]
-       }
-      }
      }
     },
     "mouse": {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
deleted file mode 100644
index 0842d0b5727..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-001.html]
-  [hit-test-floats-001]
-    expected: FAIL
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..968f62a2553
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..147f062e548
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
new file mode 100644
index 00000000000..b4eea326212
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-001.html]
+  [block-in-inline-hittest-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index 51432362d66..ee34bc91078 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,3 +1,6 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
+
+  [elementFromPoint]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
index f9e216a8cfc..cdd8b55f192 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-relpos-zindex.html]
   [position: relative; z-index: -1;]
     expected: FAIL
-
-  [block-in-inline-hittest-relpos-zindex]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/hittest-before-pseudo.html.ini b/tests/wpt/metadata/css/css-flexbox/hittest-before-pseudo.html.ini
new file mode 100644
index 00000000000..5b685485f3c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/hittest-before-pseudo.html.ini
@@ -0,0 +1,3 @@
+[hittest-before-pseudo.html]
+  [Hit-testing text within a pseudo-element flex-item should return the flexbox as the hittest result.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index b2248c64cc3..e0f17d64b55 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -80,9 +80,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -10deg' over 'italic']
     expected: FAIL
 
-  [Matching font-style: 'oblique -20deg' should prefer 'italic' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -20deg' should prefer 'oblique 0deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
@@ -140,9 +137,6 @@
   [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 5deg 10deg' over 'oblique 5deg']
-    expected: FAIL
-
   [Matching font-weight: '501' should prefer '390 410' over '300 350']
     expected: FAIL
 
@@ -164,9 +158,6 @@
   [Matching font-style: 'oblique 20deg' should prefer 'italic' over 'oblique 0deg']
     expected: FAIL
 
-  [Matching font-stretch: '90%' should prefer '60% 70%' over '110% 140%']
-    expected: FAIL
-
   [Matching font-style: 'oblique -21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
@@ -227,9 +218,6 @@
   [Matching font-stretch: '90%' should prefer '90% 100%' over '50% 80%']
     expected: FAIL
 
-  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-weight: '399' should prefer '350 399' over '340 360']
     expected: FAIL
 
@@ -326,8 +314,8 @@
   [Matching font-weight: '399' should prefer '200 300' over '400']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 5deg' over 'normal']
-    expected: FAIL
-
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -1deg 0deg' over 'oblique -20deg -15deg']
     expected: FAIL
+
+  [Matching font-weight: '501' should prefer '503 520' over '500']
+    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 e647155e783..180652f75d4 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,306 +53,6 @@
   [background-position length(px) / events]
     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
-
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
   [background-color color(rgba) / values]
     expected: FAIL
 
@@ -476,152 +176,152 @@
   [padding-bottom length(em) / values]
     expected: FAIL
 
-  [max-height length(ex) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [max-height length(mm) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [max-height length(cm) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [max-height length(in) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [max-height percentage(%) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [max-width length(pt) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [max-width length(pc) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [max-width length(px) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [max-width length(em) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [max-width length(ex) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [max-width length(mm) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [max-width length(cm) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [max-width length(in) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [max-width percentage(%) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [top length(pt) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [top length(pc) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [top length(px) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [top length(em) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [top length(ex) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [top length(mm) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [top length(cm) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [top length(in) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [top percentage(%) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [right length(pt) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [right length(pc) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [right length(px) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [right length(em) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [right length(ex) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [right length(mm) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [right length(cm) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [right length(in) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [right percentage(%) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [bottom length(pt) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [bottom length(pc) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [bottom length(px) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [bottom length(em) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [bottom length(ex) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [bottom length(mm) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [bottom length(cm) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [bottom length(in) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [bottom percentage(%) / values]
+  [text-indent length(pt) / values]
     expected: FAIL
 
-  [left length(pt) / values]
+  [text-indent length(pc) / values]
     expected: FAIL
 
-  [left length(pc) / values]
+  [text-indent length(px) / values]
     expected: FAIL
 
-  [left length(px) / values]
+  [text-indent length(em) / values]
     expected: FAIL
 
-  [left length(em) / values]
+  [text-indent length(ex) / values]
     expected: FAIL
 
-  [left length(ex) / values]
+  [text-indent length(mm) / values]
     expected: FAIL
 
-  [left length(mm) / values]
+  [text-indent length(cm) / values]
     expected: FAIL
 
-  [left length(cm) / values]
+  [text-indent length(in) / values]
     expected: FAIL
 
-  [left length(in) / values]
+  [text-indent percentage(%) / values]
     expected: FAIL
 
-  [left percentage(%) / values]
+  [text-shadow shadow(shadow) / 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 d105a77b1ee..e87f8c08864 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
@@ -55,603 +55,3 @@
 
   [background-position length(px) / 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
-
-  [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
-
-  [margin-right length(cm) / events]
-    expected: FAIL
-
-  [margin-right length(in) / events]
-    expected: FAIL
-
-  [margin-top length(pt) / events]
-    expected: FAIL
-
-  [margin-top length(pc) / events]
-    expected: FAIL
-
-  [margin-top length(px) / events]
-    expected: FAIL
-
-  [margin-top length(em) / events]
-    expected: FAIL
-
-  [margin-top length(ex) / events]
-    expected: FAIL
-
-  [margin-top length(mm) / events]
-    expected: FAIL
-
-  [margin-top length(cm) / events]
-    expected: FAIL
-
-  [margin-top length(in) / events]
-    expected: FAIL
-
-  [height length(pt) / events]
-    expected: FAIL
-
-  [height length(pc) / events]
-    expected: FAIL
-
-  [height length(px) / events]
-    expected: FAIL
-
-  [height length(em) / events]
-    expected: FAIL
-
-  [height length(ex) / events]
-    expected: FAIL
-
-  [height length(mm) / events]
-    expected: FAIL
-
-  [height length(cm) / events]
-    expected: FAIL
-
-  [height length(in) / events]
-    expected: FAIL
-
-  [height percentage(%) / events]
-    expected: FAIL
-
-  [width length(pt) / events]
-    expected: FAIL
-
-  [width length(pc) / events]
-    expected: FAIL
-
-  [width length(px) / events]
-    expected: FAIL
-
-  [width length(em) / events]
-    expected: FAIL
-
-  [width length(ex) / events]
-    expected: FAIL
-
-  [width length(mm) / events]
-    expected: FAIL
-
-  [width length(cm) / events]
-    expected: FAIL
-
-  [width length(in) / events]
-    expected: FAIL
-
-  [width percentage(%) / events]
-    expected: FAIL
-
-  [min-height length(pt) / events]
-    expected: FAIL
-
-  [min-height length(pc) / events]
-    expected: FAIL
-
-  [min-height length(px) / events]
-    expected: FAIL
-
-  [min-height length(em) / events]
-    expected: FAIL
-
-  [min-height length(ex) / events]
-    expected: FAIL
-
-  [min-height length(mm) / events]
-    expected: FAIL
-
-  [min-height length(cm) / events]
-    expected: FAIL
-
-  [min-height length(in) / events]
-    expected: FAIL
-
-  [min-height percentage(%) / events]
-    expected: FAIL
-
-  [min-width length(pt) / events]
-    expected: FAIL
-
-  [min-width length(pc) / events]
-    expected: FAIL
-
-  [min-width length(px) / events]
-    expected: FAIL
-
-  [min-width length(em) / events]
-    expected: FAIL
-
-  [min-width length(ex) / events]
-    expected: FAIL
-
-  [min-width length(mm) / events]
-    expected: FAIL
-
-  [min-width length(cm) / events]
-    expected: FAIL
-
-  [min-width length(in) / events]
-    expected: FAIL
-
-  [min-width percentage(%) / events]
-    expected: FAIL
-
-  [max-height length(pt) / events]
-    expected: FAIL
-
-  [max-height length(pc) / events]
-    expected: FAIL
-
-  [max-height length(px) / events]
-    expected: FAIL
-
-  [max-height length(em) / 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
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 b369cf511b1..242ba44bbca 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
@@ -52,426 +52,3 @@
 
   [background-position length(px) / events]
     expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    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/elementFromPoint-dynamic-anon-box.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
new file mode 100644
index 00000000000..cf67b5d03dd
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-dynamic-anon-box.html]
+  [Link should be clickable after hiding a scrollbox with an anonymous table inside]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
deleted file mode 100644
index 7e9331b6bc2..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-float-in-relative.html]
-  [elementFromPoint-float-in-relative]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-table.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-table.html.ini
new file mode 100644
index 00000000000..db065588308
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-table.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-table.html]
+  [float-in-div]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
index 8ae9bae3500..657ddd36eba 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -13,3 +13,12 @@
 
   [<li>Outside 3</li>]
     expected: FAIL
+
+  [<li>Inside 2</li>]
+    expected: FAIL
+
+  [<li>Inside 3</li>]
+    expected: FAIL
+
+  [<li>Image Inside 1</li>]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
new file mode 100644
index 00000000000..a6bca7ac372
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-visibility-hidden-resizer.html]
+  [elementFromPoint on resizer area of an element with visibility:hidden]
+    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
index e0663d34a38..ac656410273 100644
--- a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
@@ -79,3 +79,6 @@
 
   [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
     expected: FAIL
+
+  [Input: "Content-Length: 30". Expected: 30.]
+    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 37844c5e65b..f5ba8274138 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -308,6 +308,3 @@
 
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 067368ac95d..8ffb8d9df59 100644
--- a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -147,5 +147,8 @@
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
 
-  [background-image sec-fetch-site - Not sent to non-trustworthy cross-site destination]
+  [border-image sec-fetch-site - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 736ff6130a5..ee87a7bd32f 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -7,3 +7,9 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
+
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
+  [Content-Type-Options%3A%20nosniff]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
index f193b47347d..c8a3c8f9e68 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
@@ -1,9 +1,8 @@
 [scroll-restoration-fragment-scrolling-cross-origin.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Manual scroll restoration should take precedent over scrolling to fragment in cross origin navigation]
     expected: TIMEOUT
 
   [Precedence of scroll restoration mode over fragment scrolling in cross-origin history traversal]
     expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 856bb1c9901..dc1144214ef 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,10 +1,9 @@
 [iframe-src-aboutblank-navigate-immediately.html]
-  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Navigating to a different document with link click]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 324db3d9b35..5aef7ce66ce 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,3 +10,6 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
+
+  [load event does not fire on window.open('about:blank')]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini
index 27889a98fb5..9eb22957864 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html.ini
@@ -1,6 +1,7 @@
 [navigate-to-unparseable-url.html]
+  expected: TIMEOUT
   [location.href setter throws a SyntaxError DOMException for unparseable URLs]
-    expected: FAIL
+    expected: TIMEOUT
 
   [<a> tag navigate fails for unparseable URLs]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
deleted file mode 100644
index 7dc346632a4..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-same-origin.window.html]
-  [Same-origin navigation started from unload handler must be ignored]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
deleted file mode 100644
index 60a4fa51f8a..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-click.html]
-  [aElement.click() before the load event must NOT replace]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
index 6c777ea167c..e84cccbbd1f 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
@@ -1,4 +1,3 @@
 [form-submit-button-click.html]
-  expected: TIMEOUT
   [Replace before load, triggered by submitButton.click()]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
deleted file mode 100644
index f5b7b25324f..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse-during-unload.html]
-  expected: TIMEOUT
-  [Traversing the history during unload]
-    expected: TIMEOUT
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
deleted file mode 100644
index ba0aed26689..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html.ini
new file mode 100644
index 00000000000..de713daa8a0
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html.ini
@@ -0,0 +1,3 @@
+[navigate-to-about-blank-while-initial-load-pending.html]
+  [Navigating to about:blank while window.open initial load pending.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2d3fbf0f308..25d9964f057 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-1.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_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 841bafc6eca..26704422bbe 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,3 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    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 cc18f512574..2d44172f4dc 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,5 +1,6 @@
 [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
 
@@ -7,10 +8,10 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index b8bdf33cb65..00000000000
--- a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[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-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
new file mode 100644
index 00000000000..53acb938c1b
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
@@ -0,0 +1,3 @@
+[module-static-import-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini b/tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini
deleted file mode 100644
index 49887a606ef..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[task_queue_throttling.any.worker.html]
-
-[task_queue_throttling.any.html]
-  [Throttling the performance timeline task queue.]
-    expected: FAIL
diff --git a/tests/wpt/web-platform-tests/.gitignore b/tests/wpt/web-platform-tests/.gitignore
index d5b2da49def..4f85ad3c523 100644
--- a/tests/wpt/web-platform-tests/.gitignore
+++ b/tests/wpt/web-platform-tests/.gitignore
@@ -49,4 +49,4 @@ scratch
 /webaudio/idl/*
 
 # w3c-test.org PR-branch mirroring
-/submissions/
+submissions/