diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 68bf21994e8..62c2d998e8f 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
deleted file mode 100644
index 0842d0b5727..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-001.html]
-  [hit-test-floats-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 13bd6abf376..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
deleted file mode 100644
index b4eea326212..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-hittest-001.html]
-  [block-in-inline-hittest-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index 51432362d66..ee34bc91078 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,3 +1,6 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
+
+  [elementFromPoint]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
new file mode 100644
index 00000000000..3e5096beef3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-float-002.html]
+  [block-in-inline-hittest-float-002]
+    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/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
index f3d5a1904d9..d4f9786638e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -1,5 +1,4 @@
 [position-absolute-013.html]
-  expected: TIMEOUT
   [.flexbox 309]
     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 e40924f077f..1ffef9b73de 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
@@ -242,9 +242,6 @@
   [Matching font-stretch: '110%' should prefer '105%' over '100%']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'italic' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-weight: '400' should prefer '400' over '450 460']
     expected: FAIL
 
@@ -289,3 +286,36 @@
 
   [Matching font-style: 'oblique -21deg' should prefer 'italic' over 'oblique 0deg']
     expected: FAIL
+
+  [Matching font-weight: '500' should prefer '500' over '450 460']
+    expected: FAIL
+
+  [Matching font-weight: '399' should prefer '200 300' over '400']
+    expected: FAIL
+
+  [Matching font-weight: '399' should prefer '400' over '450 460']
+    expected: FAIL
+
+  [Matching font-weight: '399' should prefer '500 501' over '502 510']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '110% 120%' over '115% 116%']
+    expected: FAIL
+
+  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
+    expected: FAIL
+
+  [Matching font-style: 'italic' should prefer 'italic' over 'oblique 20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    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 3094ea29f3c..5b794f7bb18 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
@@ -202,3 +202,426 @@
 
   [margin-right length(mm) / values]
     expected: FAIL
+
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-right length(cm) / values]
+    expected: FAIL
+
+  [margin-right length(in) / values]
+    expected: FAIL
+
+  [margin-top length(pt) / values]
+    expected: FAIL
+
+  [margin-top length(pc) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [margin-top length(em) / values]
+    expected: FAIL
+
+  [margin-top length(ex) / values]
+    expected: FAIL
+
+  [margin-top length(mm) / values]
+    expected: FAIL
+
+  [margin-top length(cm) / values]
+    expected: FAIL
+
+  [margin-top length(in) / values]
+    expected: FAIL
+
+  [height length(pt) / values]
+    expected: FAIL
+
+  [height length(pc) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [height length(em) / values]
+    expected: FAIL
+
+  [height length(ex) / values]
+    expected: FAIL
+
+  [height length(mm) / values]
+    expected: FAIL
+
+  [height length(cm) / values]
+    expected: FAIL
+
+  [height length(in) / values]
+    expected: FAIL
+
+  [height percentage(%) / values]
+    expected: FAIL
+
+  [width length(pt) / values]
+    expected: FAIL
+
+  [width length(pc) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
+
+  [width length(em) / values]
+    expected: FAIL
+
+  [width length(ex) / values]
+    expected: FAIL
+
+  [width length(mm) / values]
+    expected: FAIL
+
+  [width length(cm) / values]
+    expected: FAIL
+
+  [width length(in) / values]
+    expected: FAIL
+
+  [width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [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-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
index 605e472524d..5f676ab1a8b 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
@@ -206,156 +206,6 @@
   [max-height length(em) / events]
     expected: FAIL
 
-  [max-height length(ex) / events]
-    expected: FAIL
-
-  [max-height length(mm) / events]
-    expected: FAIL
-
-  [max-height length(cm) / events]
-    expected: FAIL
-
-  [max-height length(in) / events]
-    expected: FAIL
-
-  [max-height percentage(%) / events]
-    expected: FAIL
-
-  [max-width length(pt) / events]
-    expected: FAIL
-
-  [max-width length(pc) / events]
-    expected: FAIL
-
-  [max-width length(px) / events]
-    expected: FAIL
-
-  [max-width length(em) / events]
-    expected: FAIL
-
-  [max-width length(ex) / events]
-    expected: FAIL
-
-  [max-width length(mm) / events]
-    expected: FAIL
-
-  [max-width length(cm) / events]
-    expected: FAIL
-
-  [max-width length(in) / events]
-    expected: FAIL
-
-  [max-width percentage(%) / events]
-    expected: FAIL
-
-  [top length(pt) / events]
-    expected: FAIL
-
-  [top length(pc) / events]
-    expected: FAIL
-
-  [top length(px) / events]
-    expected: FAIL
-
-  [top length(em) / events]
-    expected: FAIL
-
-  [top length(ex) / events]
-    expected: FAIL
-
-  [top length(mm) / events]
-    expected: FAIL
-
-  [top length(cm) / events]
-    expected: FAIL
-
-  [top length(in) / events]
-    expected: FAIL
-
-  [top percentage(%) / events]
-    expected: FAIL
-
-  [right length(pt) / events]
-    expected: FAIL
-
-  [right length(pc) / events]
-    expected: FAIL
-
-  [right length(px) / events]
-    expected: FAIL
-
-  [right length(em) / events]
-    expected: FAIL
-
-  [right length(ex) / events]
-    expected: FAIL
-
-  [right length(mm) / events]
-    expected: FAIL
-
-  [right length(cm) / events]
-    expected: FAIL
-
-  [right length(in) / events]
-    expected: FAIL
-
-  [right percentage(%) / events]
-    expected: FAIL
-
-  [bottom length(pt) / events]
-    expected: FAIL
-
-  [bottom length(pc) / events]
-    expected: FAIL
-
-  [bottom length(px) / events]
-    expected: FAIL
-
-  [bottom length(em) / events]
-    expected: FAIL
-
-  [bottom length(ex) / events]
-    expected: FAIL
-
-  [bottom length(mm) / events]
-    expected: FAIL
-
-  [bottom length(cm) / events]
-    expected: FAIL
-
-  [bottom length(in) / events]
-    expected: FAIL
-
-  [bottom percentage(%) / events]
-    expected: FAIL
-
-  [left length(pt) / events]
-    expected: FAIL
-
-  [left length(pc) / events]
-    expected: FAIL
-
-  [left length(px) / events]
-    expected: FAIL
-
-  [left length(em) / events]
-    expected: FAIL
-
-  [left length(ex) / events]
-    expected: FAIL
-
-  [left length(mm) / events]
-    expected: FAIL
-
-  [left length(cm) / events]
-    expected: FAIL
-
-  [left length(in) / events]
-    expected: FAIL
-
-  [left percentage(%) / events]
-    expected: FAIL
-
   [color color(rgba) / events]
     expected: FAIL
 
@@ -505,3 +355,153 @@
 
   [text-shadow shadow(shadow) / 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
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 793afafa0e8..d316d0d03ec 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
@@ -175,153 +175,3 @@
 
   [padding-bottom length(em) / 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/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
new file mode 100644
index 00000000000..b905fe70fcb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-ellipsis-in-inline-box.html]
+  [elementFromPoint-ellipsis-in-inline-box]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
new file mode 100644
index 00000000000..7e9331b6bc2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-relative.html]
+  [elementFromPoint-float-in-relative]
+    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 8d25c050330..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,9 +13,3 @@
 
   [<li>Outside 1</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/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index a3496a40d07..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[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/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 5b0339c7ad6..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,9 +7,3 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
-
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%0D%0AX-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/failure-check-sequence.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
index ab9ac6e835e..1d68034a37d 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -1,13 +1,12 @@
 [failure-check-sequence.https.html]
-  expected: TIMEOUT
   [CSP check precedes COEP check - CSP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [COEP check precedes X-Frame-Options check]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes COEP check - COEP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes X-Frame-Options check]
-    expected: TIMEOUT
+    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 51fd557bd7f..574b2fd8927 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
@@ -5,5 +5,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#foo']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
     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 78240a2f463..8ae58f9f1e2 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,3 +16,6 @@
 
   [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/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
new file mode 100644
index 00000000000..4ecd6d9f753
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
@@ -0,0 +1,3 @@
+[navigation-unload-cross-origin.sub.window.html]
+  [Cross-origin navigation started from unload handler must be ignored]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
deleted file mode 100644
index f5b7b25324f..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse-during-unload.html]
-  expected: TIMEOUT
-  [Traversing the history during unload]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index d6188c03424..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    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 bc228cfd2a2..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,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index f455bb20528..7d28d586f51 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: 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/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 5b2bee4b0a5..959b3aab71c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,12 +1,33 @@
 [select-event.html]
-  [input type text: setRangeText() disconnected node]
+  [textarea: setSelectionRange out of range event queue]
     expected: FAIL
 
-  [input type tel: selectionEnd twice in disconnected node (must fire select only once)]
+  [input type text: selectionDirection disconnected node]
     expected: FAIL
 
-  [input type tel: setRangeText() disconnected node]
+  [input type text: selectionStart out of range event queue]
     expected: FAIL
 
-  [input type password: setRangeText() event queue]
+  [input type tel: setSelectionRange out of range event queue]
+    expected: FAIL
+
+  [input type url: select() disconnected node]
+    expected: FAIL
+
+  [input type url: setRangeText() disconnected node]
+    expected: FAIL
+
+  [input type url: selectionStart out of range event queue]
+    expected: FAIL
+
+  [input type password: select() event queue]
+    expected: FAIL
+
+  [input type password: selectionStart disconnected node]
+    expected: FAIL
+
+  [input type password: selectionStart event queue]
+    expected: FAIL
+
+  [input type password: selectionEnd disconnected node]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
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..513958c40c8 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,12 +1,13 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Rejection handler on pending-then-rejected promise]
     expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Thenable resolution]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 1d71471b73c..4a48dd15a9d 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,7 +1,6 @@
 [promise-rejection-events.html]
-  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
-    expected: TIMEOUT
+    expected: FAIL
 
   [unhandledrejection: from createImageBitmap which is UA triggered]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/url/a-element-origin-xhtml.xhtml.ini b/tests/wpt/metadata-layout-2020/url/a-element-origin-xhtml.xhtml.ini
deleted file mode 100644
index d27a0dbf7db..00000000000
--- a/tests/wpt/metadata-layout-2020/url/a-element-origin-xhtml.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-element-origin-xhtml.xhtml]
-  [Parsing origin: <h://.> against <about:blank>]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/url/a-element-origin.html.ini b/tests/wpt/metadata-layout-2020/url/a-element-origin.html.ini
deleted file mode 100644
index 92d6574c6d4..00000000000
--- a/tests/wpt/metadata-layout-2020/url/a-element-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-element-origin.html]
-  [Parsing origin: <h://.> against <about:blank>]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/url/url-origin.any.js.ini b/tests/wpt/metadata-layout-2020/url/url-origin.any.js.ini
deleted file mode 100644
index d54f85723d9..00000000000
--- a/tests/wpt/metadata-layout-2020/url/url-origin.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[url-origin.any.worker.html]
-  [Origin parsing: <h://.> against <about:blank>]
-    expected: FAIL
-
-
-[url-origin.any.html]
-  [Origin parsing: <h://.> against <about:blank>]
-    expected: FAIL
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 04c2032c723..39d039a0132 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: TIMEOUT
+  expected: CRASH
   [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/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index b7b36c1d3a4..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/xhr/open-url-multi-window-5.htm.ini b/tests/wpt/metadata-layout-2020/xhr/open-url-multi-window-5.htm.ini
new file mode 100644
index 00000000000..5c5d36a6bf2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/xhr/open-url-multi-window-5.htm.ini
@@ -0,0 +1,3 @@
+[open-url-multi-window-5.htm]
+  [XMLHttpRequest: open() resolving URLs (multi-Window; 5)]
+    expected: FAIL
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index cdeaf7f7080..282ab0b2525 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 9158f967e8a..4abd88d16ab 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -442699,7 +442699,7 @@
       []
      ],
      "urltestdata.json": [
-      "b681ad59809e5e5d2e9e16a297b889369d4326f2",
+      "5833adae584a39c186faf77e031f0fad59f55124",
       []
      ]
     }
@@ -485561,6 +485561,20 @@
         {}
        ]
       ],
+      "margin-trim-computed.html": [
+       "ad2d17f2ef01d2f870a4f07cd3eccb226e4de0f2",
+       [
+        null,
+        {}
+       ]
+      ],
+      "margin-trim.html": [
+       "0d92f80b9b96ee409b141487f26cb664ce67f8df",
+       [
+        null,
+        {}
+       ]
+      ],
       "margin-valid.html": [
        "154aa2de7cb16ca0845f8368e731ec5c941108cb",
        [
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
deleted file mode 100644
index 0842d0b5727..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-001.html]
-  [hit-test-floats-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 13bd6abf376..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
deleted file mode 100644
index b4eea326212..00000000000
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-hittest-001.html]
-  [block-in-inline-hittest-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index 51432362d66..ee34bc91078 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,3 +1,6 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
+
+  [elementFromPoint]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
new file mode 100644
index 00000000000..3e5096beef3
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-float-002.html]
+  [block-in-inline-hittest-float-002]
+    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/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
index 2b2e0fce8eb..80111fb0236 100644
--- a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -1,5 +1,4 @@
 [position-absolute-013.html]
-  expected: TIMEOUT
   [.flexbox 309]
     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 75b1f12c97c..1ab4c90249c 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
@@ -251,9 +251,6 @@
   [Matching font-stretch: '110%' should prefer '105%' over '100%']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'italic' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-weight: '400' should prefer '400' over '450 460']
     expected: FAIL
 
@@ -298,3 +295,36 @@
 
   [Matching font-style: 'oblique -21deg' should prefer 'italic' over 'oblique 0deg']
     expected: FAIL
+
+  [Matching font-weight: '500' should prefer '500' over '450 460']
+    expected: FAIL
+
+  [Matching font-weight: '399' should prefer '200 300' over '400']
+    expected: FAIL
+
+  [Matching font-weight: '399' should prefer '400' over '450 460']
+    expected: FAIL
+
+  [Matching font-weight: '399' should prefer '500 501' over '502 510']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '110% 120%' over '115% 116%']
+    expected: FAIL
+
+  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
+    expected: FAIL
+
+  [Matching font-style: 'italic' should prefer 'italic' over 'oblique 20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    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 3094ea29f3c..5b794f7bb18 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
@@ -202,3 +202,426 @@
 
   [margin-right length(mm) / values]
     expected: FAIL
+
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-right length(cm) / values]
+    expected: FAIL
+
+  [margin-right length(in) / values]
+    expected: FAIL
+
+  [margin-top length(pt) / values]
+    expected: FAIL
+
+  [margin-top length(pc) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [margin-top length(em) / values]
+    expected: FAIL
+
+  [margin-top length(ex) / values]
+    expected: FAIL
+
+  [margin-top length(mm) / values]
+    expected: FAIL
+
+  [margin-top length(cm) / values]
+    expected: FAIL
+
+  [margin-top length(in) / values]
+    expected: FAIL
+
+  [height length(pt) / values]
+    expected: FAIL
+
+  [height length(pc) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [height length(em) / values]
+    expected: FAIL
+
+  [height length(ex) / values]
+    expected: FAIL
+
+  [height length(mm) / values]
+    expected: FAIL
+
+  [height length(cm) / values]
+    expected: FAIL
+
+  [height length(in) / values]
+    expected: FAIL
+
+  [height percentage(%) / values]
+    expected: FAIL
+
+  [width length(pt) / values]
+    expected: FAIL
+
+  [width length(pc) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
+
+  [width length(em) / values]
+    expected: FAIL
+
+  [width length(ex) / values]
+    expected: FAIL
+
+  [width length(mm) / values]
+    expected: FAIL
+
+  [width length(cm) / values]
+    expected: FAIL
+
+  [width length(in) / values]
+    expected: FAIL
+
+  [width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [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-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
index 605e472524d..5f676ab1a8b 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
@@ -206,156 +206,6 @@
   [max-height length(em) / events]
     expected: FAIL
 
-  [max-height length(ex) / events]
-    expected: FAIL
-
-  [max-height length(mm) / events]
-    expected: FAIL
-
-  [max-height length(cm) / events]
-    expected: FAIL
-
-  [max-height length(in) / events]
-    expected: FAIL
-
-  [max-height percentage(%) / events]
-    expected: FAIL
-
-  [max-width length(pt) / events]
-    expected: FAIL
-
-  [max-width length(pc) / events]
-    expected: FAIL
-
-  [max-width length(px) / events]
-    expected: FAIL
-
-  [max-width length(em) / events]
-    expected: FAIL
-
-  [max-width length(ex) / events]
-    expected: FAIL
-
-  [max-width length(mm) / events]
-    expected: FAIL
-
-  [max-width length(cm) / events]
-    expected: FAIL
-
-  [max-width length(in) / events]
-    expected: FAIL
-
-  [max-width percentage(%) / events]
-    expected: FAIL
-
-  [top length(pt) / events]
-    expected: FAIL
-
-  [top length(pc) / events]
-    expected: FAIL
-
-  [top length(px) / events]
-    expected: FAIL
-
-  [top length(em) / events]
-    expected: FAIL
-
-  [top length(ex) / events]
-    expected: FAIL
-
-  [top length(mm) / events]
-    expected: FAIL
-
-  [top length(cm) / events]
-    expected: FAIL
-
-  [top length(in) / events]
-    expected: FAIL
-
-  [top percentage(%) / events]
-    expected: FAIL
-
-  [right length(pt) / events]
-    expected: FAIL
-
-  [right length(pc) / events]
-    expected: FAIL
-
-  [right length(px) / events]
-    expected: FAIL
-
-  [right length(em) / events]
-    expected: FAIL
-
-  [right length(ex) / events]
-    expected: FAIL
-
-  [right length(mm) / events]
-    expected: FAIL
-
-  [right length(cm) / events]
-    expected: FAIL
-
-  [right length(in) / events]
-    expected: FAIL
-
-  [right percentage(%) / events]
-    expected: FAIL
-
-  [bottom length(pt) / events]
-    expected: FAIL
-
-  [bottom length(pc) / events]
-    expected: FAIL
-
-  [bottom length(px) / events]
-    expected: FAIL
-
-  [bottom length(em) / events]
-    expected: FAIL
-
-  [bottom length(ex) / events]
-    expected: FAIL
-
-  [bottom length(mm) / events]
-    expected: FAIL
-
-  [bottom length(cm) / events]
-    expected: FAIL
-
-  [bottom length(in) / events]
-    expected: FAIL
-
-  [bottom percentage(%) / events]
-    expected: FAIL
-
-  [left length(pt) / events]
-    expected: FAIL
-
-  [left length(pc) / events]
-    expected: FAIL
-
-  [left length(px) / events]
-    expected: FAIL
-
-  [left length(em) / events]
-    expected: FAIL
-
-  [left length(ex) / events]
-    expected: FAIL
-
-  [left length(mm) / events]
-    expected: FAIL
-
-  [left length(cm) / events]
-    expected: FAIL
-
-  [left length(in) / events]
-    expected: FAIL
-
-  [left percentage(%) / events]
-    expected: FAIL
-
   [color color(rgba) / events]
     expected: FAIL
 
@@ -505,3 +355,153 @@
 
   [text-shadow shadow(shadow) / 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
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 793afafa0e8..d316d0d03ec 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
@@ -175,153 +175,3 @@
 
   [padding-bottom length(em) / 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/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
new file mode 100644
index 00000000000..b905fe70fcb
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-ellipsis-in-inline-box.html]
+  [elementFromPoint-ellipsis-in-inline-box]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
new file mode 100644
index 00000000000..7e9331b6bc2
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-relative.html]
+  [elementFromPoint-float-in-relative]
+    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 23a8be4dfce..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,9 +13,3 @@
 
   [<li>Outside 3</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/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index a3496a40d07..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[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/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 5b0339c7ad6..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,9 +7,3 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
-
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%0D%0AX-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/failure-check-sequence.https.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
index ab9ac6e835e..1d68034a37d 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -1,13 +1,12 @@
 [failure-check-sequence.https.html]
-  expected: TIMEOUT
   [CSP check precedes COEP check - CSP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [COEP check precedes X-Frame-Options check]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes COEP check - COEP header first]
-    expected: NOTRUN
+    expected: FAIL
 
   [CSP check precedes X-Frame-Options check]
-    expected: TIMEOUT
+    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 51fd557bd7f..574b2fd8927 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
@@ -5,5 +5,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#foo']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
     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 78240a2f463..8ae58f9f1e2 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,3 +16,6 @@
 
   [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/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
new file mode 100644
index 00000000000..4ecd6d9f753
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
@@ -0,0 +1,3 @@
+[navigation-unload-cross-origin.sub.window.html]
+  [Cross-origin navigation started from unload handler must be ignored]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
deleted file mode 100644
index f5b7b25324f..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse-during-unload.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse-during-unload.html]
-  expected: TIMEOUT
-  [Traversing the history during unload]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index d6188c03424..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    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 8acae84e1e4..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,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index e5994e21efc..25d9964f057 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: 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/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 5b2bee4b0a5..959b3aab71c 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,12 +1,33 @@
 [select-event.html]
-  [input type text: setRangeText() disconnected node]
+  [textarea: setSelectionRange out of range event queue]
     expected: FAIL
 
-  [input type tel: selectionEnd twice in disconnected node (must fire select only once)]
+  [input type text: selectionDirection disconnected node]
     expected: FAIL
 
-  [input type tel: setRangeText() disconnected node]
+  [input type text: selectionStart out of range event queue]
     expected: FAIL
 
-  [input type password: setRangeText() event queue]
+  [input type tel: setSelectionRange out of range event queue]
+    expected: FAIL
+
+  [input type url: select() disconnected node]
+    expected: FAIL
+
+  [input type url: setRangeText() disconnected node]
+    expected: FAIL
+
+  [input type url: selectionStart out of range event queue]
+    expected: FAIL
+
+  [input type password: select() event queue]
+    expected: FAIL
+
+  [input type password: selectionStart disconnected node]
+    expected: FAIL
+
+  [input type password: selectionStart event queue]
+    expected: FAIL
+
+  [input type password: selectionEnd disconnected node]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
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..513958c40c8 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,12 +1,13 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Rejection handler on pending-then-rejected promise]
     expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Thenable resolution]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 1d71471b73c..4a48dd15a9d 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,7 +1,6 @@
 [promise-rejection-events.html]
-  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
-    expected: TIMEOUT
+    expected: FAIL
 
   [unhandledrejection: from createImageBitmap which is UA triggered]
     expected: FAIL
diff --git a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini
deleted file mode 100644
index d27a0dbf7db..00000000000
--- a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-element-origin-xhtml.xhtml]
-  [Parsing origin: <h://.> against <about:blank>]
-    expected: FAIL
diff --git a/tests/wpt/metadata/url/a-element-origin.html.ini b/tests/wpt/metadata/url/a-element-origin.html.ini
deleted file mode 100644
index 92d6574c6d4..00000000000
--- a/tests/wpt/metadata/url/a-element-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-element-origin.html]
-  [Parsing origin: <h://.> against <about:blank>]
-    expected: FAIL
diff --git a/tests/wpt/metadata/url/url-origin.any.js.ini b/tests/wpt/metadata/url/url-origin.any.js.ini
deleted file mode 100644
index b90856369a7..00000000000
--- a/tests/wpt/metadata/url/url-origin.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[url-origin.any.html]
-  [Origin parsing: <h://.> against <about:blank>]
-    expected: FAIL
-
-
-[url-origin.any.worker.html]
-  [Origin parsing: <h://.> against <about:blank>]
-    expected: FAIL
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 04c2032c723..39d039a0132 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: TIMEOUT
+  expected: CRASH
   [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/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index b7b36c1d3a4..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/xhr/open-url-multi-window-5.htm.ini b/tests/wpt/metadata/xhr/open-url-multi-window-5.htm.ini
new file mode 100644
index 00000000000..5c5d36a6bf2
--- /dev/null
+++ b/tests/wpt/metadata/xhr/open-url-multi-window-5.htm.ini
@@ -0,0 +1,3 @@
+[open-url-multi-window-5.htm]
+  [XMLHttpRequest: open() resolving URLs (multi-Window; 5)]
+    expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini b/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
deleted file mode 100644
index f78f699f620..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[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-box/parsing/margin-trim-computed.html b/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim-computed.html
new file mode 100644
index 00000000000..ad2d17f2ef0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim-computed.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS margin-trim computed style</title>
+<link rel="help" href="https://www.w3.org/TR/css-box-4/#margin-trim">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<meta name="assert" content="Test the computed values for margin-trim">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("margin-trim", "none");
+test_computed_value("margin-trim", "block");
+test_computed_value("margin-trim", "inline");
+test_computed_value("margin-trim", "block-start block-end", "block");
+test_computed_value("margin-trim", "inline-start inline-end", "inline");
+test_computed_value("margin-trim", "block-start");
+test_computed_value("margin-trim", "block-end");
+test_computed_value("margin-trim", "inline-start");
+test_computed_value("margin-trim", "inline-end");
+test_computed_value("margin-trim", "block-start inline-start");
+test_computed_value("margin-trim", "inline-start block-start", "block-start inline-start");
+test_computed_value("margin-trim", "inline-end block-start", "block-start inline-end");
+test_computed_value("margin-trim", "inline-end block-end", "block-end inline-end");
+test_computed_value("margin-trim", "block-start block-end inline-start", "block-start inline-start block-end");
+test_computed_value("margin-trim", "inline-start block-start inline-end block-end", "block-start inline-start block-end inline-end");
+test_computed_value("margin-trim", "inline-start inline-end block-start", "block-start inline-start inline-end");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim.html b/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim.html
new file mode 100644
index 00000000000..0d92f80b9b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS margin-trim: property parsing</title>
+<link rel="help" href="https://www.w3.org/TR/css-box-4/#margin-trim">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<meta name="assert" content="Test parsing for the margin-trim property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+// Individual values should get set
+test_valid_value("margin-trim", "none");
+test_valid_value("margin-trim", "block");
+test_valid_value("margin-trim", "inline");
+test_valid_value("margin-trim", "block-start");
+test_valid_value("margin-trim", "block-end");
+test_valid_value("margin-trim", "inline-start");
+test_valid_value("margin-trim", "inline-end");
+
+// Serialize values into either block or inline
+test_valid_value("margin-trim", "block-start block-end", "block");
+test_valid_value("margin-trim", "inline-start inline-end", "inline");
+test_valid_value("margin-trim", "block-end block-start", "block");
+test_valid_value("margin-trim", "inline-end inline-start", "inline");
+test_valid_value("margin-trim", "inline-start block-start");
+
+test_valid_value("margin-trim", "inline-end block-start block-end");
+test_valid_value("margin-trim", "block-start inline-start block-end inline-end");
+test_valid_value("margin-trim", "inline-end block-end inline-start block-start");
+
+test_invalid_value("margin-trim", "block inline");
+test_invalid_value("margin-trim", "block block");
+test_invalid_value("margin-trim", "inline inline");
+test_invalid_value("margin-trim", "block inline-start inline-end");
+test_invalid_value("margin-trim", "block block-start block-end");
+test_invalid_value("margin-trim", "block-start block-end block");
+test_invalid_value("margin-trim", "block 10px");
+test_invalid_value("margin-trim", "auto");
+test_invalid_value("margin-trim", "left");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/url/resources/urltestdata.json b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
index b681ad59809..5833adae584 100644
--- a/tests/wpt/web-platform-tests/url/resources/urltestdata.json
+++ b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
@@ -3922,7 +3922,7 @@
     "input": "h://.",
     "base": "about:blank",
     "href": "h://.",
-    "origin": "h://.",
+    "origin": "null",
     "protocol": "h:",
     "username": "",
     "password": "",