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/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 ee34bc91078..51432362d66 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,6 +1,3 @@
 [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 cdd8b55f192..f9e216a8cfc 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,3 +1,6 @@
 [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/CSS2/normal-flow/hit-test-anonymous-block.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/hit-test-anonymous-block.html.ini
deleted file mode 100644
index 7c07b71d77c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/hit-test-anonymous-block.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-anonymous-block.html]
-  [Hit test beside line of text inside anonymous block]
-    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 6acc09d916d..4cdcdbaa1a6 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
@@ -17,18 +17,12 @@
   [Matching font-weight: '400' should prefer '350 399' over '351 398']
     expected: FAIL
 
-  [Matching font-weight: '400' should prefer '351 398' over '501 550']
-    expected: FAIL
-
   [Matching font-weight: '400' should prefer '501 550' over '502 560']
     expected: FAIL
 
   [Matching font-weight: '430' should prefer '420 440' over '450 460']
     expected: FAIL
 
-  [Matching font-weight: '430' should prefer '400 425' over '350 399']
-    expected: FAIL
-
   [Matching font-weight: '430' should prefer '350 399' over '340 398']
     expected: FAIL
 
@@ -140,9 +134,6 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 40deg 50deg' over 'oblique 20deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -21deg' over 'oblique -60deg -40deg']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
@@ -188,9 +179,6 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 21deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique 20deg' over 'oblique 10deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
@@ -307,3 +295,18 @@
 
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
     expected: FAIL
+
+  [Matching font-weight: '430' should prefer '500' over '400 425']
+    expected: FAIL
+
+  [Matching font-weight: '500' should prefer '450 460' over '400']
+    expected: FAIL
+
+  [Matching font-weight: '500' should prefer '350 399' over '351 398']
+    expected: FAIL
+
+  [Matching font-weight: '501' should prefer '500' over '450 460']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 3f9c5003739..4a1232b3c22 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -1,3 +1,6 @@
 [transform-scale-hittest.html]
   [Hit test intersecting scaled box]
     expected: FAIL
+
+  [Hit test within unscaled box]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index a112f8541a9..ddb5c8d2b0c 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,425 +53,152 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [background-color color(rgba) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [border-top-width length(pt) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [border-top-width length(pc) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [border-top-width length(px) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [border-top-width length(em) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [border-top-width length(ex) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [border-top-width length(mm) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [border-top-width length(cm) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [border-top-width length(in) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [border-right-width length(pt) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [border-right-width length(pc) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [border-right-width length(px) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [border-right-width length(em) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [border-right-width length(ex) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [border-right-width length(mm) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [border-right-width length(cm) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [border-right-width length(in) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [border-bottom-width length(pt) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [border-bottom-width length(pc) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [border-bottom-width length(px) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [border-bottom-width length(em) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [border-bottom-width length(ex) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [border-bottom-width length(mm) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [border-bottom-width length(cm) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [border-bottom-width length(in) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [border-left-width length(pt) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [border-left-width length(pc) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [border-left-width length(px) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [border-left-width length(em) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [border-left-width length(ex) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [border-left-width length(mm) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [border-left-width length(cm) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [border-left-width length(in) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [border-top-color color(rgba) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [border-right-color color(rgba) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [border-left-color color(rgba) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [padding-bottom length(pt) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [padding-bottom length(pc) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [padding-bottom length(px) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [padding-bottom length(em) / values]
+  [text-indent length(pt) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
+  [text-indent length(pc) / values]
     expected: FAIL
 
-  [margin-right length(in) / values]
+  [text-indent length(px) / values]
     expected: FAIL
 
-  [margin-top length(pt) / values]
+  [text-indent length(em) / values]
     expected: FAIL
 
-  [margin-top length(pc) / values]
+  [text-indent length(ex) / values]
     expected: FAIL
 
-  [margin-top length(px) / values]
+  [text-indent length(mm) / values]
     expected: FAIL
 
-  [margin-top length(em) / values]
+  [text-indent length(cm) / values]
     expected: FAIL
 
-  [margin-top length(ex) / values]
+  [text-indent length(in) / values]
     expected: FAIL
 
-  [margin-top length(mm) / values]
+  [text-indent percentage(%) / 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
-
-  [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]
+  [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 c47467d84ab..845bef47ab4 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
@@ -56,156 +56,6 @@
   [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
-
   [background-color color(rgba) / events]
     expected: FAIL
 
@@ -328,3 +178,303 @@
 
   [padding-bottom 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
+
+  [color color(rgba) / events]
+    expected: FAIL
+
+  [font-size length(pt) / events]
+    expected: FAIL
+
+  [font-size length(pc) / events]
+    expected: FAIL
+
+  [font-size length(px) / events]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
+  [font-size length(ex) / events]
+    expected: FAIL
+
+  [font-size length(mm) / events]
+    expected: FAIL
+
+  [font-size length(cm) / events]
+    expected: FAIL
+
+  [font-size length(in) / events]
+    expected: FAIL
+
+  [font-size percentage(%) / events]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / events]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / events]
+    expected: FAIL
+
+  [line-height number(integer) / events]
+    expected: FAIL
+
+  [line-height number(decimal) / events]
+    expected: FAIL
+
+  [line-height length(pt) / events]
+    expected: FAIL
+
+  [line-height length(pc) / events]
+    expected: FAIL
+
+  [line-height length(px) / events]
+    expected: FAIL
+
+  [line-height length(em) / events]
+    expected: FAIL
+
+  [line-height length(ex) / events]
+    expected: FAIL
+
+  [line-height length(mm) / events]
+    expected: FAIL
+
+  [line-height length(cm) / events]
+    expected: FAIL
+
+  [line-height length(in) / events]
+    expected: FAIL
+
+  [line-height percentage(%) / events]
+    expected: FAIL
+
+  [letter-spacing length(pt) / events]
+    expected: FAIL
+
+  [letter-spacing length(pc) / events]
+    expected: FAIL
+
+  [letter-spacing length(px) / events]
+    expected: FAIL
+
+  [letter-spacing length(em) / events]
+    expected: FAIL
+
+  [letter-spacing length(ex) / events]
+    expected: FAIL
+
+  [letter-spacing length(mm) / events]
+    expected: FAIL
+
+  [letter-spacing length(cm) / events]
+    expected: FAIL
+
+  [letter-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing length(pt) / events]
+    expected: FAIL
+
+  [word-spacing length(pc) / events]
+    expected: FAIL
+
+  [word-spacing length(px) / events]
+    expected: FAIL
+
+  [word-spacing length(em) / events]
+    expected: FAIL
+
+  [word-spacing length(ex) / events]
+    expected: FAIL
+
+  [word-spacing length(mm) / events]
+    expected: FAIL
+
+  [word-spacing length(cm) / events]
+    expected: FAIL
+
+  [word-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing percentage(%) / events]
+    expected: FAIL
+
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
+    expected: FAIL
diff --git a/tests/wpt/metadata-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 67aa4130027..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
-
-  [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
-
-  [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
diff --git a/tests/wpt/metadata-layout-2020/css/css-ui/accent-color-invalidation-currentcolor.html.ini b/tests/wpt/metadata-layout-2020/css/css-ui/accent-color-invalidation-currentcolor.html.ini
new file mode 100644
index 00000000000..19a0be52219
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-ui/accent-color-invalidation-currentcolor.html.ini
@@ -0,0 +1,2 @@
+[accent-color-invalidation-currentcolor.html]
+  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 d701934cf73..1f892861935 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,12 +13,3 @@
 
   [<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/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 1bf6ea475bf..3ddd598f5c4 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -16,3 +16,6 @@
 
   [test the top of layer]
     expected: FAIL
+
+  [test some point of the element: top left corner]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..a3496a40d07
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,3 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    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 dbe03dd880c..3285a4f15ac 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
@@ -76,9 +76,3 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
-
-  [Input: "Content-Length: 42,42". Expected: 42.]
-    expected: FAIL
-
-  [Input: "Content-Length: 42\\r\\nContent-Length: 42,42". Expected: 42.]
-    expected: FAIL
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 4564f783908..736ff6130a5 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,6 +7,3 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     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
index a3f473a9557..1f528be38ef 100644
--- 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
@@ -1,4 +1,4 @@
 [scroll-restoration-fragment-scrolling-cross-origin.html]
-  expected: TIMEOUT
+  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 dc1144214ef..530635e744f 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
@@ -2,8 +2,5 @@
   [Navigating to a different document with window.open]
     expected: FAIL
 
-  [Navigating to a different document with form submission]
-    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-iframe-contentWindow.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index 149bcb4ff8c..b6aa0bab7b8 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -8,5 +8,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
index a06984505e9..7391c19ce91 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
@@ -4,7 +4,16 @@
     expected: NOTRUN
 
   [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: string completion]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: undefined completion]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: undefined completion]
+    expected: TIMEOUT
+
+  [Navigating an iframe via location.href to a javascript: URL must not fire beforeunload: string completion]
+    expected: NOTRUN
+
+  [Navigating an iframe via src="" to a javascript: URL after insertion must not fire beforeunload: string completion]
+    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..78240a2f463 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -16,6 +16,3 @@
 
   [D83D DE0D set in href="" targeting a frame and clicked]
     expected: FAIL
-
-  [DE0D 0041 set in href="" targeting a frame and clicked]
-    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
new file mode 100644
index 00000000000..f5b7b25324f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
@@ -0,0 +1,4 @@
+[traverse-during-unload.html]
+  expected: TIMEOUT
+  [Traversing the history during unload]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 4b4820d1729..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/image-smoothing/imagesmoothing.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/image-smoothing/imagesmoothing.html.ini
new file mode 100644
index 00000000000..52663ea3f55
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/image-smoothing/imagesmoothing.html.ini
@@ -0,0 +1,3 @@
+[imagesmoothing.html]
+  [Test that imageSmoothingEnabled = false (nearest-neighbor interpolation) works with stroke() and createPattern().]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini
index 830aeb8ae48..fdc27d37788 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini
@@ -1,7 +1,6 @@
 [autofocus-dialog.html]
-  expected: TIMEOUT
   [<dialog> can contain autofocus, without stopping page autofocus content from working]
     expected: FAIL
 
   [<dialog>-contained autofocus element gets focused when the dialog is shown]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index b680c14d61c..ddd65fdcec8 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,19 +1,15 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
index d30d032e7b5..865b8601bae 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
@@ -1,4 +1,3 @@
 [update-the-rendering.html]
-  expected: TIMEOUT
   ["Flush autofocus candidates" should be happen before a scroll event and animation frame callbacks]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
new file mode 100644
index 00000000000..09c049e4b58
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
@@ -0,0 +1,3 @@
+[media_fragment_seek.html]
+  [Video should seek to time specified in media fragment syntax]
+    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-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 6a420504feb..1c4e58a8ba1 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index e8872b3585b..bbc1f35d8d9 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
index 428a2e45fb2..6d9838acfc4 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
@@ -175,3 +175,6 @@
 
   [application/x-www-form-urlencoded: 0x00 in value (normal form)]
     expected: FAIL
+
+  [application/x-www-form-urlencoded: backslash in value (normal form)]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
new file mode 100644
index 00000000000..0aacf5bf6a9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -0,0 +1,9 @@
+[select-event.html]
+  [input type search: selectionEnd event queue]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range disconnected node]
+    expected: FAIL
+
+  [input type tel: selectionEnd a second time (must not fire select)]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 7f099cec1b0..e0d30013daf 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,4 +1,5 @@
 [htmlanchorelement_noopener.html]
+  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
@@ -7,3 +8,6 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
+
+  [Check that rel=noopener with target=_self does a normal load]
+    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/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 31bfd644df0..8bcf3a07de4 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,4 +16,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini b/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
index f7bc47e5724..49b17a921b5 100644
--- a/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
@@ -40,61 +40,61 @@
     expected: FAIL
 
   [content-type 13 : text/plain,*/*;charset=gbk]
-    expected: TIMEOUT
+    expected: FAIL
 
   [content-type 14 : text/html,*/*;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 15 : text/html;x=",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 16 : text/html;",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 17 : text/html;",\\",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 18 : text/html;",\\",text/plain,";charset=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 19 : text/html;",",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 1 : text/html;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 2 : TEXT/HTML;CHARSET=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 4 : text/html;charset=gbk(]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 5 : text/html;x=(;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 7 : text/html;charset=gbk;charset=windows-1255]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 8 : text/html;charset=();charset=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 10 : text/html;charset =gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 11 : text/html ;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 12 : text/html; charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 13 : text/html;charset= gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 14 : text/html;charset= "gbk"]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 16 : text/html;charset=\x0bgbk]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [mime-type 17 : text/html;charset=\x0cgbk]
     expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
index 39d039a0132..04c2032c723 100644
--- a/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
@@ -1,5 +1,5 @@
 [cross-partition.https.tentative.html]
-  expected: CRASH
+  expected: TIMEOUT
   [BroadcastChannel messages aren't received from a cross-partition iframe]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
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
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index d7407b13fc7..c9dd64173a3 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -1318,7 +1318,14 @@
          {}
         ]
        ]
-      }
+      },
+      "dirty-rowgroup-crash.html": [
+       "2a66cd452a7a86283d28a287a1e2005f40bfc1f7",
+       [
+        null,
+        {}
+       ]
+      ]
      },
      "content-visibility": {
       "content-visibility-continuations-crash.html": [
@@ -1363,6 +1370,15 @@
         {}
        ]
       ],
+      "crashtests": {
+       "first-line-and-inline-block.html": [
+        "6d6c6605ee0486cd6329e2d81372ed25ad5d3f17",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "detach-locked-slot-children-crash.html": [
        "409a9697b2f862c9fee90158194e3eb41c1c80bf",
        [
@@ -188551,7 +188567,7 @@
       ]
      ],
      "object-fit-contain-png-001c.html": [
-      "0f8195157e310cd69c05dcfd8a786972b981d2f1",
+      "4fb7f113897e22dbf6eec0b7c9c9a83b136ebd8d",
       [
        null,
        [
@@ -188560,23 +188576,7 @@
          "=="
         ]
        ],
-       {
-        "fuzzy": [
-         [
-          null,
-          [
-           [
-            0,
-            20
-           ],
-           [
-            0,
-            2000
-           ]
-          ]
-         ]
-        ]
-       }
+       {}
       ]
      ],
      "object-fit-contain-png-001e.html": [
@@ -188632,7 +188632,7 @@
       ]
      ],
      "object-fit-contain-png-002c.html": [
-      "14834316a32efbf8f80c4612a93951e0fa792c51",
+      "738c015a52e471528dd7855e7e75ff064bc6a881",
       [
        null,
        [
@@ -188641,23 +188641,7 @@
          "=="
         ]
        ],
-       {
-        "fuzzy": [
-         [
-          null,
-          [
-           [
-            0,
-            20
-           ],
-           [
-            0,
-            2000
-           ]
-          ]
-         ]
-        ]
-       }
+       {}
       ]
      ],
      "object-fit-contain-png-002e.html": [
@@ -189493,7 +189477,7 @@
       ]
      ],
      "object-fit-fill-png-001c.html": [
-      "0e2a3883fe2f05a2c89dbc0d87617aa965097330",
+      "36031175e63f751e7d46af6cd43d92485e8af544",
       [
        null,
        [
@@ -189502,23 +189486,7 @@
          "=="
         ]
        ],
-       {
-        "fuzzy": [
-         [
-          null,
-          [
-           [
-            0,
-            20
-           ],
-           [
-            0,
-            3200
-           ]
-          ]
-         ]
-        ]
-       }
+       {}
       ]
      ],
      "object-fit-fill-png-001e.html": [
@@ -189574,7 +189542,7 @@
       ]
      ],
      "object-fit-fill-png-002c.html": [
-      "43bcced9f26c672c641bd5e1c6e48855ad1b23dc",
+      "a332c37f4f043650e1052d18a67e86bd6fc1cdfa",
       [
        null,
        [
@@ -189583,23 +189551,7 @@
          "=="
         ]
        ],
-       {
-        "fuzzy": [
-         [
-          null,
-          [
-           [
-            0,
-            20
-           ],
-           [
-            0,
-            3200
-           ]
-          ]
-         ]
-        ]
-       }
+       {}
       ]
      ],
      "object-fit-fill-png-002e.html": [
@@ -487922,6 +487874,13 @@
         {}
        ]
       ],
+      "container-units-ineligible-container.html": [
+       "8882d4a38ba030e694e22d96d32ce2ecb2301b40",
+       [
+        null,
+        {}
+       ]
+      ],
       "container-units-invalidation.html": [
        "abb766cd0c77b033e4aace48cf499897c3fd2347",
        [
@@ -488195,6 +488154,13 @@
         {}
        ]
       ],
+      "pseudo-elements-008.html": [
+       "1d722a46b659ec8d11dc1ace9bf19d6e65be3f33",
+       [
+        null,
+        {}
+       ]
+      ],
       "query-content-box.html": [
        "5f6cc9fdbe0719fe673d6d24cf6601823e63883d",
        [
@@ -502630,7 +502596,7 @@
        ]
       ],
       "auto-010.html": [
-       "021612a3aeb286f68ce2f3c896d620b75800f235",
+       "03a9056c438d12d84edb0c9981bcacb54478432b",
        [
         null,
         {}
@@ -681902,7 +681868,7 @@
       ]
      ],
      "msid-generate.html": [
-      "8673039836bb2fe6602cebcce33acb0e5e30ae85",
+      "226f2e64284ebdadaaa0025b39ba977f9ae90abd",
       [
        null,
        {}
@@ -726548,7 +726514,7 @@
          ]
         ],
         "event_buffer.py": [
-         "c30ad8a4d16001717071ac0b51c7f41ae9b7bb5c",
+         "69c96c8c545a4192b1b85b3af4de3bd283c5ad40",
          [
           null,
           {}
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/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 ee34bc91078..51432362d66 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,6 +1,3 @@
 [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 cdd8b55f192..f9e216a8cfc 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,3 +1,6 @@
 [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/CSS2/normal-flow/hit-test-anonymous-block.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/hit-test-anonymous-block.html.ini
deleted file mode 100644
index 7c07b71d77c..00000000000
--- a/tests/wpt/metadata/css/CSS2/normal-flow/hit-test-anonymous-block.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-anonymous-block.html]
-  [Hit test beside line of text inside anonymous block]
-    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 44240d4f186..637496569c9 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
@@ -14,9 +14,6 @@
   [Matching font-weight: '400' should prefer '501 550' over '502 560']
     expected: FAIL
 
-  [Matching font-weight: '430' should prefer '400 425' over '350 399']
-    expected: FAIL
-
   [Matching font-weight: '500' should prefer '351 398' over '501 550']
     expected: FAIL
 
@@ -128,9 +125,6 @@
   [Matching font-weight: '430' should prefer '350 399' over '340 398']
     expected: FAIL
 
-  [Matching font-weight: '400' should prefer '351 398' over '501 550']
-    expected: FAIL
-
   [Matching font-weight: '501' should prefer '501' over '502 510']
     expected: FAIL
 
@@ -149,9 +143,6 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 40deg 50deg' over 'oblique 20deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -21deg' over 'oblique -60deg -40deg']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
@@ -197,9 +188,6 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 21deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique 20deg' over 'oblique 10deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
@@ -316,3 +304,18 @@
 
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
     expected: FAIL
+
+  [Matching font-weight: '430' should prefer '500' over '400 425']
+    expected: FAIL
+
+  [Matching font-weight: '500' should prefer '450 460' over '400']
+    expected: FAIL
+
+  [Matching font-weight: '500' should prefer '350 399' over '351 398']
+    expected: FAIL
+
+  [Matching font-weight: '501' should prefer '500' over '450 460']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html.ini
deleted file mode 100644
index 98f844212dd..00000000000
--- a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[trailing-other-space-separators-break-spaces-007.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 3f9c5003739..4a1232b3c22 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -1,3 +1,6 @@
 [transform-scale-hittest.html]
   [Hit test intersecting scaled box]
     expected: FAIL
+
+  [Hit test within unscaled box]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index a112f8541a9..ddb5c8d2b0c 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,425 +53,152 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [background-color color(rgba) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [border-top-width length(pt) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [border-top-width length(pc) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [border-top-width length(px) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [border-top-width length(em) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [border-top-width length(ex) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [border-top-width length(mm) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [border-top-width length(cm) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [border-top-width length(in) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [border-right-width length(pt) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [border-right-width length(pc) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [border-right-width length(px) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [border-right-width length(em) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [border-right-width length(ex) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [border-right-width length(mm) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [border-right-width length(cm) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [border-right-width length(in) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [border-bottom-width length(pt) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [border-bottom-width length(pc) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [border-bottom-width length(px) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [border-bottom-width length(em) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [border-bottom-width length(ex) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [border-bottom-width length(mm) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [border-bottom-width length(cm) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [border-bottom-width length(in) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [border-left-width length(pt) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [border-left-width length(pc) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [border-left-width length(px) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [border-left-width length(em) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [border-left-width length(ex) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [border-left-width length(mm) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [border-left-width length(cm) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [border-left-width length(in) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [border-top-color color(rgba) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [border-right-color color(rgba) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [border-left-color color(rgba) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [padding-bottom length(pt) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [padding-bottom length(pc) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [padding-bottom length(px) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [padding-bottom length(em) / values]
+  [text-indent length(pt) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
+  [text-indent length(pc) / values]
     expected: FAIL
 
-  [margin-right length(in) / values]
+  [text-indent length(px) / values]
     expected: FAIL
 
-  [margin-top length(pt) / values]
+  [text-indent length(em) / values]
     expected: FAIL
 
-  [margin-top length(pc) / values]
+  [text-indent length(ex) / values]
     expected: FAIL
 
-  [margin-top length(px) / values]
+  [text-indent length(mm) / values]
     expected: FAIL
 
-  [margin-top length(em) / values]
+  [text-indent length(cm) / values]
     expected: FAIL
 
-  [margin-top length(ex) / values]
+  [text-indent length(in) / values]
     expected: FAIL
 
-  [margin-top length(mm) / values]
+  [text-indent percentage(%) / 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
-
-  [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]
+  [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 c47467d84ab..845bef47ab4 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,156 +56,6 @@
   [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
-
   [background-color color(rgba) / events]
     expected: FAIL
 
@@ -328,3 +178,303 @@
 
   [padding-bottom 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
+
+  [color color(rgba) / events]
+    expected: FAIL
+
+  [font-size length(pt) / events]
+    expected: FAIL
+
+  [font-size length(pc) / events]
+    expected: FAIL
+
+  [font-size length(px) / events]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
+  [font-size length(ex) / events]
+    expected: FAIL
+
+  [font-size length(mm) / events]
+    expected: FAIL
+
+  [font-size length(cm) / events]
+    expected: FAIL
+
+  [font-size length(in) / events]
+    expected: FAIL
+
+  [font-size percentage(%) / events]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / events]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / events]
+    expected: FAIL
+
+  [line-height number(integer) / events]
+    expected: FAIL
+
+  [line-height number(decimal) / events]
+    expected: FAIL
+
+  [line-height length(pt) / events]
+    expected: FAIL
+
+  [line-height length(pc) / events]
+    expected: FAIL
+
+  [line-height length(px) / events]
+    expected: FAIL
+
+  [line-height length(em) / events]
+    expected: FAIL
+
+  [line-height length(ex) / events]
+    expected: FAIL
+
+  [line-height length(mm) / events]
+    expected: FAIL
+
+  [line-height length(cm) / events]
+    expected: FAIL
+
+  [line-height length(in) / events]
+    expected: FAIL
+
+  [line-height percentage(%) / events]
+    expected: FAIL
+
+  [letter-spacing length(pt) / events]
+    expected: FAIL
+
+  [letter-spacing length(pc) / events]
+    expected: FAIL
+
+  [letter-spacing length(px) / events]
+    expected: FAIL
+
+  [letter-spacing length(em) / events]
+    expected: FAIL
+
+  [letter-spacing length(ex) / events]
+    expected: FAIL
+
+  [letter-spacing length(mm) / events]
+    expected: FAIL
+
+  [letter-spacing length(cm) / events]
+    expected: FAIL
+
+  [letter-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing length(pt) / events]
+    expected: FAIL
+
+  [word-spacing length(pc) / events]
+    expected: FAIL
+
+  [word-spacing length(px) / events]
+    expected: FAIL
+
+  [word-spacing length(em) / events]
+    expected: FAIL
+
+  [word-spacing length(ex) / events]
+    expected: FAIL
+
+  [word-spacing length(mm) / events]
+    expected: FAIL
+
+  [word-spacing length(cm) / events]
+    expected: FAIL
+
+  [word-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing percentage(%) / events]
+    expected: FAIL
+
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index 67aa4130027..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
-
-  [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
-
-  [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
diff --git a/tests/wpt/metadata/css/css-ui/accent-color-invalidation-currentcolor.html.ini b/tests/wpt/metadata/css/css-ui/accent-color-invalidation-currentcolor.html.ini
new file mode 100644
index 00000000000..19a0be52219
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/accent-color-invalidation-currentcolor.html.ini
@@ -0,0 +1,2 @@
+[accent-color-invalidation-currentcolor.html]
+  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 657ddd36eba..8ae9bae3500 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,12 +13,3 @@
 
   [<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/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 898f39c4330..9f2a3229231 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -20,3 +20,6 @@
 
   [test the top of layer]
     expected: FAIL
+
+  [test some point of the element: top left corner]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..a3496a40d07
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,3 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    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 dbe03dd880c..3285a4f15ac 100644
--- a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
@@ -76,9 +76,3 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
-
-  [Input: "Content-Length: 42,42". Expected: 42.]
-    expected: FAIL
-
-  [Input: "Content-Length: 42\\r\\nContent-Length: 42,42". Expected: 42.]
-    expected: FAIL
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 4564f783908..736ff6130a5 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -7,6 +7,3 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     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 6e9f7acf151..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,6 +1,6 @@
 [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
 
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 dc1144214ef..530635e744f 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
@@ -2,8 +2,5 @@
   [Navigating to a different document with window.open]
     expected: FAIL
 
-  [Navigating to a different document with form submission]
-    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-iframe-contentWindow.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index 149bcb4ff8c..b6aa0bab7b8 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -8,5 +8,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
index a06984505e9..7391c19ce91 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
@@ -4,7 +4,16 @@
     expected: NOTRUN
 
   [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: string completion]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: undefined completion]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: undefined completion]
+    expected: TIMEOUT
+
+  [Navigating an iframe via location.href to a javascript: URL must not fire beforeunload: string completion]
+    expected: NOTRUN
+
+  [Navigating an iframe via src="" to a javascript: URL after insertion must not fire beforeunload: string completion]
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..78240a2f463 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -16,6 +16,3 @@
 
   [D83D DE0D set in href="" targeting a frame and clicked]
     expected: FAIL
-
-  [DE0D 0041 set in href="" targeting a frame and clicked]
-    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
new file mode 100644
index 00000000000..f5b7b25324f
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
@@ -0,0 +1,4 @@
+[traverse-during-unload.html]
+  expected: TIMEOUT
+  [Traversing the history during unload]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 4b4820d1729..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/canvas/element/manual/image-smoothing/imagesmoothing.html.ini b/tests/wpt/metadata/html/canvas/element/manual/image-smoothing/imagesmoothing.html.ini
new file mode 100644
index 00000000000..52663ea3f55
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/element/manual/image-smoothing/imagesmoothing.html.ini
@@ -0,0 +1,3 @@
+[imagesmoothing.html]
+  [Test that imageSmoothingEnabled = false (nearest-neighbor interpolation) works with stroke() and createPattern().]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini
index 830aeb8ae48..fdc27d37788 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html.ini
@@ -1,7 +1,6 @@
 [autofocus-dialog.html]
-  expected: TIMEOUT
   [<dialog> can contain autofocus, without stopping page autofocus content from working]
     expected: FAIL
 
   [<dialog>-contained autofocus element gets focused when the dialog is shown]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 58a99633547..d169bd2e9fa 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,19 +1,15 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
index 9b27c5c1957..add66c12f92 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
@@ -1,7 +1,6 @@
 [update-the-rendering.html]
-  expected: TIMEOUT
   ["Flush autofocus candidates" should be happen after the first animation frame callbacks, and before a resize event in the next iteration of window event loop.]
     expected: TIMEOUT
 
   ["Flush autofocus candidates" should be happen before a scroll event and animation frame callbacks]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
new file mode 100644
index 00000000000..09c049e4b58
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
@@ -0,0 +1,3 @@
+[media_fragment_seek.html]
+  [Video should seek to time specified in media fragment syntax]
+    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-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index fe55ddae3f1..6fcdfb95246 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index f9138fb999a..6f7461b9472 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
index 428a2e45fb2..6d9838acfc4 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
@@ -175,3 +175,6 @@
 
   [application/x-www-form-urlencoded: 0x00 in value (normal form)]
     expected: FAIL
+
+  [application/x-www-form-urlencoded: backslash in value (normal form)]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
new file mode 100644
index 00000000000..0aacf5bf6a9
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -0,0 +1,9 @@
+[select-event.html]
+  [input type search: selectionEnd event queue]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range disconnected node]
+    expected: FAIL
+
+  [input type tel: selectionEnd a second time (must not fire select)]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 071b4378add..73807cb3cc1 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
 
@@ -11,3 +12,6 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
+
+  [Check that rel=noopener with target=_self does a normal load]
+    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/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 31bfd644df0..8bcf3a07de4 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,4 +16,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini b/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
index f7bc47e5724..49b17a921b5 100644
--- a/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
@@ -40,61 +40,61 @@
     expected: FAIL
 
   [content-type 13 : text/plain,*/*;charset=gbk]
-    expected: TIMEOUT
+    expected: FAIL
 
   [content-type 14 : text/html,*/*;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 15 : text/html;x=",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 16 : text/html;",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 17 : text/html;",\\",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 18 : text/html;",\\",text/plain,";charset=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [content-type 19 : text/html;",",text/plain]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 1 : text/html;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 2 : TEXT/HTML;CHARSET=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 4 : text/html;charset=gbk(]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 5 : text/html;x=(;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 7 : text/html;charset=gbk;charset=windows-1255]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 8 : text/html;charset=();charset=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 10 : text/html;charset =gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 11 : text/html ;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 12 : text/html; charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 13 : text/html;charset= gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 14 : text/html;charset= "gbk"]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 16 : text/html;charset=\x0bgbk]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [mime-type 17 : text/html;charset=\x0cgbk]
     expected: NOTRUN
diff --git a/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini b/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
index 39d039a0132..04c2032c723 100644
--- a/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
+++ b/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
@@ -1,5 +1,5 @@
 [cross-partition.https.tentative.html]
-  expected: CRASH
+  expected: TIMEOUT
   [BroadcastChannel messages aren't received from a cross-partition iframe]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/stylesheet_media_queries.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/stylesheet_media_queries.html.ini
index 6c827cec320..77ca6b0688d 100644
--- a/tests/wpt/mozilla/meta-layout-2020/css/stylesheet_media_queries.html.ini
+++ b/tests/wpt/mozilla/meta-layout-2020/css/stylesheet_media_queries.html.ini
@@ -1,4 +1,3 @@
 [stylesheet_media_queries.html]
   [Media queries within stylesheets]
     expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/css/stylesheet_media_queries.html.ini b/tests/wpt/mozilla/meta/css/stylesheet_media_queries.html.ini
new file mode 100644
index 00000000000..77ca6b0688d
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/stylesheet_media_queries.html.ini
@@ -0,0 +1,3 @@
+[stylesheet_media_queries.html]
+  [Media queries within stylesheets]
+    expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini b/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
new file mode 100644
index 00000000000..f78f699f620
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
@@ -0,0 +1,3 @@
+[scrollBy.html]
+  [Ensure that the window.scrollBy function affects scroll position as expected]
+    expected: FAIL
diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-ineligible-container.html b/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-ineligible-container.html
new file mode 100644
index 00000000000..8882d4a38ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-ineligible-container.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Container Relative Units: ineligible container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-lengths">
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<style>
+  #grandparent, #parent { container-type: size; }
+  #grandparent { width: 300px; height: 250px; }
+  #parent { width: 200px; height: 150px; }
+  #target { width: 10cqw; height: 10cqh; }
+</style>
+<div id="log"></div>
+<div id="grandparent">
+  <div id="parent">
+    <div id="target"></div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/cq-testcommon.js"></script>
+<script>
+  setup(() => assert_implements_container_queries());
+  const cases = {
+    "/* basic */": [20, 15],
+    "display: table": [30, 25],
+    "display: table-cell": [30, 25],
+    "display: inline": [30, 25],
+    "display: contents": [30, 25],
+    "display: none": [30, 25],
+    "container-type: normal": [30, 25],
+    "container-type: inline-size": [20, 25],
+    "container-type: inline-size; writing-mode: vertical-lr": [30, 15],
+  };
+  const parent = document.getElementById("parent");
+  const target = document.getElementById("target");
+  const cs = getComputedStyle(target);
+  for (let [style, [width, height]] of Object.entries(cases)) {
+    test(() => {
+      parent.style.cssText = style;
+      assert_equals(cs.width, width + "px", "width");
+      assert_equals(cs.height, height + "px", "height");
+    }, style);
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/dirty-rowgroup-crash.html b/tests/wpt/web-platform-tests/css/css-contain/container-queries/dirty-rowgroup-crash.html
new file mode 100644
index 00000000000..2a66cd452a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/container-queries/dirty-rowgroup-crash.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<div style='container-type: size;'></div>
+<table>
+  <tbody id='id_0'></tbody>
+    <th id='id_1'>
+      <tr>
+        <th></th>
+      </tr>
+    </th>
+</table>
+<script>
+  const tbody = document.getElementById('id_0')
+  tbody.getBoundingClientRect();
+  const theader = document.getElementById('id_1')
+  tbody.outerText = 'foo';
+  theader.setAttribute('rowspan', 100)
+  tbody.getBoundingClientRect();
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-008.html b/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-008.html
new file mode 100644
index 00000000000..1d722a46b65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-008.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<title>@container: originating element container for pseudo elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-queries">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/cq-testcommon.js"></script>
+<style>
+  .container { container-type: inline-size; }
+  #target { display: list-item; }
+  #target::before { content: "PASS"; font-size: 10cqw; }
+  #target::after { font-size: 10cqw; }
+  #target::marker { font-size: 10cqw; }
+  #target::first-line { font-size: 10cqw; }
+  #target::first-letter { font-size: 10cqw; }
+  #outer::first-line { font-size: 10cqw; }
+  #outer::first-letter { font-size: 10cqw; }
+  dialog::backdrop { font-size: 10cqw; }
+</style>
+<div style="width: 400px" class="container">
+  <div style="width: 300px" class="container">
+    <div id="target" class="container" style="width: 200px">First-line</div>
+    <dialog id="dialog" class="container" style="width: 100px"></dialog>
+  </div>
+  <div style="width: 400px" class="container">
+    <div id="outer" style="width: 300px" class="container">
+      <div class="container" style="width: 200px">First-line</div>
+  </div>
+</div>
+<script>
+  setup(() => assert_implements_container_queries());
+
+  test(() => {
+    assert_equals(getComputedStyle(target, "::before").fontSize, "20px");
+  }, "Originating element container for ::before");
+  test(() => {
+    assert_equals(getComputedStyle(target, "::after").fontSize, "20px");
+  }, "Originating element container for ::after");
+  test(() => {
+    assert_equals(getComputedStyle(target, "::marker").fontSize, "20px");
+  }, "Originating element container for ::marker");
+  test(() => {
+    assert_equals(getComputedStyle(target, "::first-line").fontSize, "20px");
+  }, "Originating element container for ::first-line");
+  test(() => {
+    assert_equals(getComputedStyle(target, "::first-letter").fontSize, "20px");
+  }, "Originating element container for ::first-letter");
+  test(() => {
+    assert_equals(getComputedStyle(outer, "::first-line").fontSize, "30px");
+  }, "Originating element container for outer ::first-line");
+  test(() => {
+    assert_equals(getComputedStyle(outer, "::first-letter").fontSize, "30px");
+  }, "Originating element container for outer ::first-letter");
+  test((t) => {
+    t.add_cleanup(() => dialog.close());
+    assert_equals(getComputedStyle(dialog, "::backdrop").fontSize, "30px", "::backdrop not rendered");
+    dialog.showModal();
+    assert_equals(getComputedStyle(dialog, "::backdrop").fontSize, "10px", "::backdrop rendered");
+  }, "Originating element container for ::backdrop");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html
new file mode 100644
index 00000000000..6d6c6605ee0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<style>
+div, span {
+  content-visibility: auto;
+  contain-intrinsic-width: auto 100vw;
+}
+div::first-line {
+  color: blue;
+}
+</style>
+<div>
+  <span style="display: inline-block">foo</span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001c.html b/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001c.html
index 0f8195157e3..4fb7f113897 100644
--- a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001c.html
+++ b/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001c.html
@@ -12,7 +12,6 @@
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
     <link rel="match" href="object-fit-contain-png-001-ref.html">
-    <meta name=fuzzy content="maxDifference=0-20;totalPixels=0-2000">
     <style type="text/css">
       canvas {
         border: 1px dashed gray;
diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002c.html b/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002c.html
index 14834316a32..738c015a52e 100644
--- a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002c.html
+++ b/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002c.html
@@ -12,7 +12,6 @@
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
     <link rel="match" href="object-fit-contain-png-002-ref.html">
-    <meta name=fuzzy content="maxDifference=0-20;totalPixels=0-2000">
     <style type="text/css">
       canvas {
         border: 1px dashed gray;
diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001c.html b/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001c.html
index 0e2a3883fe2..36031175e63 100644
--- a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001c.html
+++ b/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001c.html
@@ -12,7 +12,6 @@
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
     <link rel="match" href="object-fit-fill-png-001-ref.html">
-    <meta name=fuzzy content="maxDifference=0-20;totalPixels=0-3200">
     <style type="text/css">
       canvas {
         border: 1px dashed gray;
diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002c.html b/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002c.html
index 43bcced9f26..a332c37f4f0 100644
--- a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002c.html
+++ b/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002c.html
@@ -12,7 +12,6 @@
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
     <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
     <link rel="match" href="object-fit-fill-png-002-ref.html">
-    <meta name=fuzzy content="maxDifference=0-20;totalPixels=0-3200">
     <style type="text/css">
       canvas {
         border: 1px dashed gray;
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-010.html b/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-010.html
index 021612a3aeb..03a9056c438 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-010.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-010.html
@@ -60,6 +60,11 @@ function checkSizes(expectedSizes, msg) {
   }
 }
 
+function checkSize(expectedWidth, expectedHeight, msg) {
+  assert_equals(target.clientWidth, expectedWidth, msg + " - clientWidth");
+  assert_equals(target.clientHeight, expectedHeight, msg + " - clientHeight");
+}
+
 function nextRendering() {
   return new Promise(resolve => {
     requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
@@ -72,7 +77,7 @@ promise_test(async function() {
 
   await nextRendering();
   target.className = "cis-auto content-skip";
-  checkSizes([[50, 150]], "Using last remembered size");
+  checkSize(50, 150, "Using last remembered size");
 }, "Last remembered size supports multiple fragments");
 
 promise_test(async function() {
@@ -85,6 +90,6 @@ promise_test(async function() {
 
   await nextRendering();
   target.className = "cis-auto content-skip";
-  checkSizes([[50, 175]], "Using updated last remembered size");
+  checkSize(50, 175, "Using updated last remembered size");
 }, "Last remembered size is updated when 2nd fragment changes size");
 </script>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/event_buffer.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/event_buffer.py
index c30ad8a4d16..69c96c8c545 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/event_buffer.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/event_buffer.py
@@ -10,6 +10,10 @@ from . import assert_base_entry, create_log
 async def test_console_log_cached_messages(
     bidi_session, wait_for_event, log_type, new_tab
 ):
+    # Clear events buffer.
+    await bidi_session.session.subscribe(events=["log.entryAdded"])
+    await bidi_session.session.unsubscribe(events=["log.entryAdded"])
+
     # Log a message before subscribing
     expected_text = await create_log(bidi_session, new_tab, log_type, "cached_message")
 
@@ -63,6 +67,10 @@ async def test_console_log_cached_messages(
 async def test_console_log_cached_message_after_refresh(
     bidi_session, subscribe_events, new_tab, log_type
 ):
+    # Clear events buffer.
+    await bidi_session.session.subscribe(events=["log.entryAdded"])
+    await bidi_session.session.unsubscribe(events=["log.entryAdded"])
+
     # Track all received log.entryAdded events in the events array
     events = []
 
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/msid-generate.html b/tests/wpt/web-platform-tests/webrtc/protocol/msid-generate.html
index 8673039836b..226f2e64284 100644
--- a/tests/wpt/web-platform-tests/webrtc/protocol/msid-generate.html
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/msid-generate.html
@@ -55,4 +55,61 @@ promise_test(async t => {
   assert_regexp_match(msid_lines[1], /^a=msid:[\!#$%&'*+-.0-9a-zA-Z]/);
 }, 'AddTrack with two streams produces two MSID lines');
 
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const stream1 = await getNoiseStream({audio: true});
+  pc.addTrack(stream1.getTracks()[0], stream1, stream1);
+  const desc = await pc.createOffer();
+  const msid_lines = msidLines(desc);
+  assert_equals(msid_lines.length, 1);
+  assert_regexp_match(msid_lines[0], /^a=msid:[\!#$%&'*+-.0-9a-zA-Z]/);
+}, 'AddTrack with the stream twice produces single MSID with a stream ID');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const stream1 = await getNoiseStream({audio: true});
+  pc.addTransceiver(stream1.getTracks()[0]);
+  const desc = await pc.createOffer();
+  const msid_lines = msidLines(desc);
+  assert_equals(msid_lines.length, 1);
+  assert_regexp_match(msid_lines[0], /^a=msid:-/);
+}, 'AddTransceiver without a stream produces MSID with no stream ID');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const stream1 = await getNoiseStream({audio: true});
+  pc.addTransceiver(stream1.getTracks()[0], {streams: [stream1]});
+  const desc = await pc.createOffer();
+  const msid_lines = msidLines(desc);
+  assert_equals(msid_lines.length, 1);
+  assert_regexp_match(msid_lines[0], /^a=msid:[\!#$%&'*+-.0-9a-zA-Z]/);
+}, 'AddTransceiver with a stream produces MSID with a stream ID');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const stream1 = await getNoiseStream({audio: true});
+  const stream2 = new MediaStream(stream1.getTracks());
+  pc.addTransceiver(stream1.getTracks()[0], {streams: [stream1, stream2]});
+  const desc = await pc.createOffer();
+  const msid_lines = msidLines(desc);
+  assert_equals(msid_lines.length, 2);
+  assert_regexp_match(msid_lines[0], /^a=msid:[\!#$%&'*+-.0-9a-zA-Z]/);
+  assert_regexp_match(msid_lines[1], /^a=msid:[\!#$%&'*+-.0-9a-zA-Z]/);
+}, 'AddTransceiver with two streams produces two MSID lines');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const stream1 = await getNoiseStream({audio: true});
+  pc.addTransceiver(stream1.getTracks()[0], {streams: [stream1, stream1]});
+const desc = await pc.createOffer();
+  const msid_lines = msidLines(desc);
+  assert_equals(msid_lines.length, 1);
+  assert_regexp_match(msid_lines[0], /^a=msid:[\!#$%&'*+-.0-9a-zA-Z]/);
+}, 'AddTransceiver with the stream twice produces single MSID with a stream ID');
+
 </script>