diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
index 33fc78f48d9..08ab7bd35cd 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
@@ -2,6 +2,3 @@
   expected: TIMEOUT
   [Blob charset should override any auto-detected charset.]
     expected: TIMEOUT
-
-  [Blob charset should override <meta charset>.]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index 665ec4646cb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 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/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index 147f062e548..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 66a6e016faa..39069192147 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -5,5 +5,8 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 4]
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
new file mode 100644
index 00000000000..b4eea326212
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-001.html]
+  [block-in-inline-hittest-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
index f9e216a8cfc..cdd8b55f192 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-relpos-zindex.html]
   [position: relative; z-index: -1;]
     expected: FAIL
-
-  [block-in-inline-hittest-relpos-zindex]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
index e32da21630a..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
@@ -965,3 +965,158 @@
   [.flexbox 129]
     expected: FAIL
 
+  [.flexbox 10]
+    expected: FAIL
+
+  [.flexbox 12]
+    expected: FAIL
+
+  [.flexbox 20]
+    expected: FAIL
+
+  [.flexbox 31]
+    expected: FAIL
+
+  [.flexbox 33]
+    expected: FAIL
+
+  [.flexbox 47]
+    expected: FAIL
+
+  [.flexbox 58]
+    expected: FAIL
+
+  [.flexbox 60]
+    expected: FAIL
+
+  [.flexbox 68]
+    expected: FAIL
+
+  [.flexbox 79]
+    expected: FAIL
+
+  [.flexbox 81]
+    expected: FAIL
+
+  [.flexbox 95]
+    expected: FAIL
+
+  [.flexbox 107]
+    expected: FAIL
+
+  [.flexbox 115]
+    expected: FAIL
+
+  [.flexbox 117]
+    expected: FAIL
+
+  [.flexbox 128]
+    expected: FAIL
+
+  [.flexbox 142]
+    expected: FAIL
+
+  [.flexbox 144]
+    expected: FAIL
+
+  [.flexbox 155]
+    expected: FAIL
+
+  [.flexbox 167]
+    expected: FAIL
+
+  [.flexbox 176]
+    expected: FAIL
+
+  [.flexbox 188]
+    expected: FAIL
+
+  [.flexbox 203]
+    expected: FAIL
+
+  [.flexbox 215]
+    expected: FAIL
+
+  [.flexbox 224]
+    expected: FAIL
+
+  [.flexbox 236]
+    expected: FAIL
+
+  [.flexbox 250]
+    expected: FAIL
+
+  [.flexbox 252]
+    expected: FAIL
+
+  [.flexbox 262]
+    expected: FAIL
+
+  [.flexbox 264]
+    expected: FAIL
+
+  [.flexbox 271]
+    expected: FAIL
+
+  [.flexbox 273]
+    expected: FAIL
+
+  [.flexbox 283]
+    expected: FAIL
+
+  [.flexbox 285]
+    expected: FAIL
+
+  [.flexbox 298]
+    expected: FAIL
+
+  [.flexbox 300]
+    expected: FAIL
+
+  [.flexbox 308]
+    expected: FAIL
+
+  [.flexbox 319]
+    expected: FAIL
+
+  [.flexbox 321]
+    expected: FAIL
+
+  [.flexbox 335]
+    expected: FAIL
+
+  [.flexbox 346]
+    expected: FAIL
+
+  [.flexbox 348]
+    expected: FAIL
+
+  [.flexbox 356]
+    expected: FAIL
+
+  [.flexbox 367]
+    expected: FAIL
+
+  [.flexbox 369]
+    expected: FAIL
+
+  [.flexbox 383]
+    expected: FAIL
+
+  [.flexbox 395]
+    expected: FAIL
+
+  [.flexbox 403]
+    expected: FAIL
+
+  [.flexbox 405]
+    expected: FAIL
+
+  [.flexbox 416]
+    expected: FAIL
+
+  [.flexbox 430]
+    expected: FAIL
+
+  [.flexbox 432]
+    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 c942620cfc7..171f113d587 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
@@ -59,9 +59,6 @@
   [Matching font-weight: '501' should prefer '501' over '502 510']
     expected: FAIL
 
-  [Matching font-weight: '501' should prefer '502 510' over '503 520']
-    expected: FAIL
-
   [Matching font-weight: '501' should prefer '500' over '450 460']
     expected: FAIL
 
@@ -98,9 +95,6 @@
   [Matching font-stretch: '110%' should prefer '115% 116%' over '105%']
     expected: FAIL
 
-  [Matching font-stretch: '110%' should prefer '105%' over '100%']
-    expected: FAIL
-
   [Matching font-stretch: '110%' should prefer '100%' over '50% 80%']
     expected: FAIL
 
@@ -179,9 +173,6 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 10deg' over 'oblique 5deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 10deg' should prefer 'oblique 15deg 20deg' over 'oblique 30deg 60deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
@@ -194,9 +185,6 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 0deg' should prefer 'oblique 0deg' over 'oblique 5deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
     expected: FAIL
 
@@ -287,9 +275,6 @@
   [Matching font-stretch: '90%' should prefer '60% 70%' over '110% 140%']
     expected: FAIL
 
-  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 5deg 10deg' over 'oblique 5deg']
     expected: FAIL
 
@@ -301,3 +286,27 @@
 
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 21deg' over 'oblique 30deg 60deg']
     expected: FAIL
+
+  [Matching font-weight: '430' should prefer '500' over '400 425']
+    expected: FAIL
+
+  [Matching font-weight: '430' should prefer '340 398' over '501 550']
+    expected: FAIL
+
+  [Matching font-style: 'italic' should prefer 'oblique 0deg' over 'oblique -60deg -30deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -20deg' should prefer 'oblique -10deg' over 'italic']
+    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 dc6f99a5b15..73c4b4ace57 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,275 +53,302 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [background-color color(rgba) / values]
+  [padding-bottom length(ex) / values]
     expected: FAIL
 
-  [border-top-width length(pt) / values]
+  [padding-bottom length(mm) / values]
     expected: FAIL
 
-  [border-top-width length(pc) / values]
+  [padding-bottom length(cm) / values]
     expected: FAIL
 
-  [border-top-width length(px) / values]
+  [padding-bottom length(in) / values]
     expected: FAIL
 
-  [border-top-width length(em) / values]
+  [padding-left length(pt) / values]
     expected: FAIL
 
-  [border-top-width length(ex) / values]
+  [padding-left length(pc) / values]
     expected: FAIL
 
-  [border-top-width length(mm) / values]
+  [padding-left length(px) / values]
     expected: FAIL
 
-  [border-top-width length(cm) / values]
+  [padding-left length(em) / values]
     expected: FAIL
 
-  [border-top-width length(in) / values]
+  [padding-left length(ex) / values]
     expected: FAIL
 
-  [border-right-width length(pt) / values]
+  [padding-left length(mm) / values]
     expected: FAIL
 
-  [border-right-width length(pc) / values]
+  [padding-left length(cm) / values]
     expected: FAIL
 
-  [border-right-width length(px) / values]
+  [padding-left length(in) / values]
     expected: FAIL
 
-  [border-right-width length(em) / values]
+  [padding-right length(pt) / values]
     expected: FAIL
 
-  [border-right-width length(ex) / values]
+  [padding-right length(pc) / values]
     expected: FAIL
 
-  [border-right-width length(mm) / values]
+  [padding-right length(px) / values]
     expected: FAIL
 
-  [border-right-width length(cm) / values]
+  [padding-right length(em) / values]
     expected: FAIL
 
-  [border-right-width length(in) / values]
+  [padding-right length(ex) / values]
     expected: FAIL
 
-  [border-bottom-width length(pt) / values]
+  [padding-right length(mm) / values]
     expected: FAIL
 
-  [border-bottom-width length(pc) / values]
+  [padding-right length(cm) / values]
     expected: FAIL
 
-  [border-bottom-width length(px) / values]
+  [padding-right length(in) / values]
     expected: FAIL
 
-  [border-bottom-width length(em) / values]
+  [padding-top length(pt) / values]
     expected: FAIL
 
-  [border-bottom-width length(ex) / values]
+  [padding-top length(pc) / values]
     expected: FAIL
 
-  [border-bottom-width length(mm) / values]
+  [padding-top length(px) / values]
     expected: FAIL
 
-  [border-bottom-width length(cm) / values]
+  [padding-top length(em) / values]
     expected: FAIL
 
-  [border-bottom-width length(in) / values]
+  [padding-top length(ex) / values]
     expected: FAIL
 
-  [border-left-width length(pt) / values]
+  [padding-top length(mm) / values]
     expected: FAIL
 
-  [border-left-width length(pc) / values]
+  [padding-top length(cm) / values]
     expected: FAIL
 
-  [border-left-width length(px) / values]
+  [padding-top length(in) / values]
     expected: FAIL
 
-  [border-left-width length(em) / values]
+  [margin-bottom length(pt) / values]
     expected: FAIL
 
-  [border-left-width length(ex) / values]
+  [margin-bottom length(pc) / values]
     expected: FAIL
 
-  [border-left-width length(mm) / values]
+  [margin-bottom length(px) / values]
     expected: FAIL
 
-  [border-left-width length(cm) / values]
+  [margin-bottom length(em) / values]
     expected: FAIL
 
-  [border-left-width length(in) / values]
+  [margin-bottom length(ex) / values]
     expected: FAIL
 
-  [border-top-color color(rgba) / values]
+  [margin-bottom length(mm) / values]
     expected: FAIL
 
-  [border-right-color color(rgba) / values]
+  [margin-bottom length(cm) / values]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / values]
+  [margin-bottom length(in) / values]
     expected: FAIL
 
-  [border-left-color color(rgba) / values]
+  [margin-left length(pt) / values]
     expected: FAIL
 
-  [padding-bottom length(pt) / values]
+  [margin-left length(pc) / values]
     expected: FAIL
 
-  [padding-bottom length(pc) / values]
+  [margin-left length(px) / values]
     expected: FAIL
 
-  [padding-bottom length(px) / values]
+  [margin-left length(em) / values]
     expected: FAIL
 
-  [padding-bottom length(em) / values]
+  [margin-left length(ex) / values]
     expected: FAIL
 
-  [max-height length(ex) / values]
+  [margin-left length(mm) / values]
     expected: FAIL
 
-  [max-height length(mm) / values]
+  [margin-left length(cm) / values]
     expected: FAIL
 
-  [max-height length(cm) / values]
+  [margin-left length(in) / values]
     expected: FAIL
 
-  [max-height length(in) / values]
+  [margin-right length(pt) / values]
     expected: FAIL
 
-  [max-height percentage(%) / values]
+  [margin-right length(pc) / values]
     expected: FAIL
 
-  [max-width length(pt) / values]
+  [margin-right length(px) / values]
     expected: FAIL
 
-  [max-width length(pc) / values]
+  [margin-right length(em) / values]
     expected: FAIL
 
-  [max-width length(px) / values]
+  [margin-right length(ex) / values]
     expected: FAIL
 
-  [max-width length(em) / values]
+  [margin-right length(mm) / values]
     expected: FAIL
 
-  [max-width length(ex) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [max-width length(mm) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [max-width length(cm) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [max-width length(in) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [max-width percentage(%) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [top length(pt) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [top length(pc) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [top length(px) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [top length(em) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [top length(ex) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [top length(mm) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [top length(cm) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [top length(in) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [top percentage(%) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [right length(pt) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [right length(pc) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [right length(px) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [right length(em) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [right length(ex) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [right length(mm) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [right length(cm) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [right length(in) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [right percentage(%) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [bottom length(pt) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [bottom length(pc) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [bottom length(px) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [bottom length(em) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [bottom length(ex) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [bottom length(mm) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [bottom length(cm) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [bottom length(in) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [bottom percentage(%) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [left length(pt) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [left length(pc) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [left length(px) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [left length(em) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [left length(ex) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [left length(mm) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [left length(cm) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [left length(in) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [left percentage(%) / values]
+  [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 8769d9a909c..86c90d1d2b7 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
@@ -478,3 +478,303 @@
 
   [left percentage(%) / 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
+
+  [margin-right length(cm) / events]
+    expected: FAIL
+
+  [margin-right length(in) / events]
+    expected: FAIL
+
+  [margin-top length(pt) / events]
+    expected: FAIL
+
+  [margin-top length(pc) / events]
+    expected: FAIL
+
+  [margin-top length(px) / events]
+    expected: FAIL
+
+  [margin-top length(em) / events]
+    expected: FAIL
+
+  [margin-top length(ex) / events]
+    expected: FAIL
+
+  [margin-top length(mm) / events]
+    expected: FAIL
+
+  [margin-top length(cm) / events]
+    expected: FAIL
+
+  [margin-top length(in) / events]
+    expected: FAIL
+
+  [height length(pt) / events]
+    expected: FAIL
+
+  [height length(pc) / events]
+    expected: FAIL
+
+  [height length(px) / events]
+    expected: FAIL
+
+  [height length(em) / events]
+    expected: FAIL
+
+  [height length(ex) / events]
+    expected: FAIL
+
+  [height length(mm) / events]
+    expected: FAIL
+
+  [height length(cm) / events]
+    expected: FAIL
+
+  [height length(in) / events]
+    expected: FAIL
+
+  [height percentage(%) / events]
+    expected: FAIL
+
+  [width length(pt) / events]
+    expected: FAIL
+
+  [width length(pc) / events]
+    expected: FAIL
+
+  [width length(px) / events]
+    expected: FAIL
+
+  [width length(em) / events]
+    expected: FAIL
+
+  [width length(ex) / events]
+    expected: FAIL
+
+  [width length(mm) / events]
+    expected: FAIL
+
+  [width length(cm) / events]
+    expected: FAIL
+
+  [width length(in) / events]
+    expected: FAIL
+
+  [width percentage(%) / events]
+    expected: FAIL
+
+  [min-height length(pt) / events]
+    expected: FAIL
+
+  [min-height length(pc) / events]
+    expected: FAIL
+
+  [min-height length(px) / events]
+    expected: FAIL
+
+  [min-height length(em) / events]
+    expected: FAIL
+
+  [min-height length(ex) / events]
+    expected: FAIL
+
+  [min-height length(mm) / events]
+    expected: FAIL
+
+  [min-height length(cm) / events]
+    expected: FAIL
+
+  [min-height length(in) / events]
+    expected: FAIL
+
+  [min-height percentage(%) / events]
+    expected: FAIL
+
+  [min-width length(pt) / events]
+    expected: FAIL
+
+  [min-width length(pc) / events]
+    expected: FAIL
+
+  [min-width length(px) / events]
+    expected: FAIL
+
+  [min-width length(em) / events]
+    expected: FAIL
+
+  [min-width length(ex) / events]
+    expected: FAIL
+
+  [min-width length(mm) / events]
+    expected: FAIL
+
+  [min-width length(cm) / events]
+    expected: FAIL
+
+  [min-width length(in) / events]
+    expected: FAIL
+
+  [min-width percentage(%) / events]
+    expected: FAIL
+
+  [max-height length(pt) / events]
+    expected: FAIL
+
+  [max-height length(pc) / events]
+    expected: FAIL
+
+  [max-height length(px) / events]
+    expected: FAIL
+
+  [max-height length(em) / events]
+    expected: FAIL
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 5a107d55d99..d1bd3a0fa3a 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
@@ -325,3 +325,303 @@
 
   [margin-right length(mm) / values]
     expected: FAIL
+
+  [margin-right length(cm) / values]
+    expected: FAIL
+
+  [margin-right length(in) / values]
+    expected: FAIL
+
+  [margin-top length(pt) / values]
+    expected: FAIL
+
+  [margin-top length(pc) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [margin-top length(em) / values]
+    expected: FAIL
+
+  [margin-top length(ex) / values]
+    expected: FAIL
+
+  [margin-top length(mm) / values]
+    expected: FAIL
+
+  [margin-top length(cm) / values]
+    expected: FAIL
+
+  [margin-top length(in) / values]
+    expected: FAIL
+
+  [height length(pt) / values]
+    expected: FAIL
+
+  [height length(pc) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [height length(em) / values]
+    expected: FAIL
+
+  [height length(ex) / values]
+    expected: FAIL
+
+  [height length(mm) / values]
+    expected: FAIL
+
+  [height length(cm) / values]
+    expected: FAIL
+
+  [height length(in) / values]
+    expected: FAIL
+
+  [height percentage(%) / values]
+    expected: FAIL
+
+  [width length(pt) / values]
+    expected: FAIL
+
+  [width length(pc) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
+
+  [width length(em) / values]
+    expected: FAIL
+
+  [width length(ex) / values]
+    expected: FAIL
+
+  [width length(mm) / values]
+    expected: FAIL
+
+  [width length(cm) / values]
+    expected: FAIL
+
+  [width length(in) / values]
+    expected: FAIL
+
+  [width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [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-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini
index 2b8affa2206..0734ab0db2c 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-003.html.ini
@@ -4,90 +4,3 @@
 
   [background-position length-em(em) / values]
     expected: FAIL
-
-  [border-top-width length-em(em) / events]
-    expected: FAIL
-
-  [border-right-width length-em(em) / events]
-    expected: FAIL
-
-  [border-bottom-width length-em(em) / events]
-    expected: FAIL
-
-  [border-left-width length-em(em) / events]
-    expected: FAIL
-
-  [padding-bottom length-em(em) / events]
-    expected: FAIL
-
-  [padding-left length-em(em) / events]
-    expected: FAIL
-
-  [padding-right length-em(em) / events]
-    expected: FAIL
-
-  [padding-top length-em(em) / events]
-    expected: FAIL
-
-  [margin-bottom length-em(em) / events]
-    expected: FAIL
-
-  [margin-left length-em(em) / events]
-    expected: FAIL
-
-  [margin-right length-em(em) / events]
-    expected: FAIL
-
-  [margin-top length-em(em) / events]
-    expected: FAIL
-
-  [height length-em(em) / events]
-    expected: FAIL
-
-  [width length-em(em) / events]
-    expected: FAIL
-
-  [min-height length-em(em) / events]
-    expected: FAIL
-
-  [min-width length-em(em) / events]
-    expected: FAIL
-
-  [max-height length-em(em) / events]
-    expected: FAIL
-
-  [max-width length-em(em) / events]
-    expected: FAIL
-
-  [top length-em(em) / events]
-    expected: FAIL
-
-  [right length-em(em) / events]
-    expected: FAIL
-
-  [bottom length-em(em) / events]
-    expected: FAIL
-
-  [left length-em(em) / events]
-    expected: FAIL
-
-  [line-height length-em(em) / events]
-    expected: FAIL
-
-  [letter-spacing length-em(em) / events]
-    expected: FAIL
-
-  [word-spacing length-em(em) / events]
-    expected: FAIL
-
-  [text-indent length-em(em) / events]
-    expected: FAIL
-
-  [outline-offset length-em(em) / events]
-    expected: FAIL
-
-  [outline-width length-em(em) / events]
-    expected: FAIL
-
-  [vertical-align length-em(em) / events]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
deleted file mode 100644
index 7e9331b6bc2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-float-in-relative.html]
-  [elementFromPoint-float-in-relative]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
index dd30b620211..2b915688f6e 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
@@ -14,8 +14,5 @@
   [<li>Outside 1</li>]
     expected: FAIL
 
-  [<li>Image Inside 1</li>]
-    expected: FAIL
-
-  [<li>Image Inside 2</li>]
+  [<li>Inside 2</li>]
     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 3285a4f15ac..ac656410273 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
@@ -76,3 +76,9 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
+
+  [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
+    expected: FAIL
+
+  [Input: "Content-Length: 30". Expected: 30.]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 36a410bfecb..0d48169e3cc 100644
--- a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -147,5 +147,5 @@
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
 
-  [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: FAIL
+  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
+    expected: TIMEOUT
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 1bca09f21d6..c5fc1407992 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,4 +1,5 @@
 [iframe-src-aboutblank-navigate-immediately.html]
+  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
@@ -6,4 +7,4 @@
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: FAIL
+    expected: TIMEOUT
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 8298274f967..c07cbe00d9b 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
@@ -7,3 +7,6 @@
 
   [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='']
+    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 d70c1bd7ef5..d96b182328a 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
@@ -1,10 +1,19 @@
 [javascript-url-no-beforeunload.window.html]
   expected: TIMEOUT
   [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: 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: string completion]
     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-referrer.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
index bcda478adb1..5a245d61359 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
@@ -1,10 +1,6 @@
 [javascript-url-referrer.window.html]
-  expected: TIMEOUT
   [unsafe-url referrer policy used to create the starting page]
     expected: FAIL
 
   [origin referrer policy used to create the starting page]
     expected: FAIL
-
-  [no-referrer referrer policy used to create the starting page]
-    expected: TIMEOUT
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/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
new file mode 100644
index 00000000000..60a4fa51f8a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
@@ -0,0 +1,3 @@
+[a-click.html]
+  [aElement.click() before the load event must NOT replace]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
index f18f914e4a4..16371ab858d 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
@@ -1,3 +1,4 @@
 [form-submit.html]
+  expected: TIMEOUT
   [Replace before load, triggered by formElement.submit()]
-    expected: FAIL
+    expected: TIMEOUT
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 7da2bc5ac80..6a420504feb 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,4 +1,3 @@
 [iframe_sandbox_popups_escaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-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/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index c6f1e5d7d84..4034793cc72 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-2.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/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/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..e06eefccd67
--- /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 text: setSelectionRange() event queue]
+    expected: FAIL
+
+  [input type text: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd event queue]
+    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..a88d2c8f411 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
 
@@ -6,4 +7,7 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
new file mode 100644
index 00000000000..2212b9d731f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
@@ -0,0 +1,4 @@
+[async-script.html?reload]
+  expected: ERROR
+
+[async-script.html]
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-different-function-realm.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 7237f5792de..dbe1def99e3 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,4 +12,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index eed03df37f3..b7537329068 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
diff --git a/tests/wpt/metadata-layout-2020/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini b/tests/wpt/metadata-layout-2020/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
new file mode 100644
index 00000000000..aa6c9e5b826
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
@@ -0,0 +1,4 @@
+[localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html]
+  expected: TIMEOUT
+  [StorageKey: test 3P about:blank window opened from a 3P iframe]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
index 33fc78f48d9..08ab7bd35cd 100644
--- a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
@@ -2,6 +2,3 @@
   expected: TIMEOUT
   [Blob charset should override any auto-detected charset.]
     expected: TIMEOUT
-
-  [Blob charset should override <meta charset>.]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index c894ba79e2a..c4d4f4f8a13 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -127766,6 +127766,35 @@
        ]
       ]
      },
+     "background-attachment-local-hidden.html": [
+      "cbe3440e3894e79223d4f647397a32da60411420",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            60
+           ],
+           [
+            0,
+            394
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "background-attachment-margin-root-001.html": [
       "88bc2845e8b6a6e24ca33547e704deab28e046bb",
       [
@@ -190624,7 +190653,165 @@
        ],
        {}
       ]
-     ]
+     ],
+     "initial-letter": {
+      "Initial-letter-breaking-rtl.html": [
+       "3f8327fda904b73d1b79bb2f075624e36eb93fe9",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "Initial-letter-breaking-vlr.html": [
+       "c432ed81112e5e0022916c4dec57d5dfc5c636ce",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "Initial-letter-breaking-vrl.html": [
+       "e7d9c2ad908c040072e971472434dd12377a6bbf",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "Initial-letter-breaking.html": [
+       "e6d15162eca584ad13d4d53ac688ee352d30658f",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/Initial-letter-breaking-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-float-001-rtl.html": [
+       "96b2811771476eecc439aecf2125c40067cdf437",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-float-001-vlr.html": [
+       "d9b98462d43c281c49b614dd965b299049bf3df8",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-float-001-vrl.html": [
+       "850321fd751c354d10ed86afad1458d1539a269f",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-float-001.html": [
+       "76e83c6a939be693f9f32c14398225eb742045b1",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-float-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-float-002.html": [
+       "6f266ea0e05ee5ede7bb2bf41782efe1b59a8c14",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-float-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-floats-003.html": [
+       "c16645fc0c3567488568b0197901005097ec0724",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-floats-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-floats-004.html": [
+       "32beedf5f8e679b17fb1f0d3722cf607667a8986",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-floats-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "initial-letter-floats-005.html": [
+       "0ad557bff092c78a9f1aae192f56364d7385113d",
+       [
+        null,
+        [
+         [
+          "/css/css-inline/initial-letter/initial-letter-floats-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     }
     },
     "css-layout-api": {
      "auto-block-size": {
@@ -358153,6 +358340,10 @@
        "2b568109db28719bc2973d350874f0685a630185",
        []
       ],
+      "background-attachment-local-hidden-ref.html": [
+       "fc593c23cd048af09b6ddc053524ca4ef8281e3d",
+       []
+      ],
       "background-clip-002-ref.html": [
        "a03d6e202091f4ea0d1a62948b60e4e12ef2ccef",
        []
@@ -374563,7 +374754,57 @@
      "empty-text-node-001-ref.html": [
       "7ec7f1bdb0b910cb1b525535d3cc1a280a3b6136",
       []
-     ]
+     ],
+     "initial-letter": {
+      "Initial-letter-breaking-ref.html": [
+       "74788e7f60cef117383252a178f06890dddf1d3b",
+       []
+      ],
+      "Initial-letter-breaking-rtl-ref.html": [
+       "c9ff86ee90f8935261176c9d599712802c1b6c03",
+       []
+      ],
+      "Initial-letter-breaking-vlr-ref.html": [
+       "34856a52b1476c279eb3b5df9992e193e84ee044",
+       []
+      ],
+      "Initial-letter-breaking-vrl-ref.html": [
+       "6b0363b6841ea2963ecfda2a4d8d965287e2bdc0",
+       []
+      ],
+      "initial-letter-float-001-ref.html": [
+       "ebb90a64dd4862af26ccfe25397998c54c1b66da",
+       []
+      ],
+      "initial-letter-float-001-rtl-ref.html": [
+       "62df03f30d684f1800888dc66232a8acc23849d0",
+       []
+      ],
+      "initial-letter-float-001-vlr-ref.html": [
+       "3982a3669cd3945cf1f31995d620213b8660500d",
+       []
+      ],
+      "initial-letter-float-001-vrl-ref.html": [
+       "816d8403bac7ef9869cb981545c59dfaa0592360",
+       []
+      ],
+      "initial-letter-float-002-ref.html": [
+       "df71adc04a59e829a72f49edca28b1ad696ee63e",
+       []
+      ],
+      "initial-letter-floats-003-ref.html": [
+       "86770a9398941c3b8bf1aa7aed7b52c6991060cc",
+       []
+      ],
+      "initial-letter-floats-004-ref.html": [
+       "76dab2b2b91a72fef7ae505c7d6970d358bf2f0f",
+       []
+      ],
+      "initial-letter-floats-005-ref.html": [
+       "34112a1d403cd271b1d8b3da5a0a22d09f202a22",
+       []
+      ]
+     }
     },
     "css-layout-api": {
      "META.yml": [
@@ -438227,11 +438468,11 @@
         []
        ],
        "firefox.py": [
-        "36ab48a62b3b12da160c49d2f1f8eb0d89737f69",
+        "3e005ef09493742d14cfb7878a3929042208c869",
         []
        ],
        "firefox_android.py": [
-        "a909e044e7349edfacd3fe282d5829ebbec3a359",
+        "6e418540b9454b4005aff7c73e2c93e3306035c6",
         []
        ],
        "ie.py": [
@@ -438580,7 +438821,7 @@
        []
       ],
       "wptcommandline.py": [
-       "22ce8010a0e6dc14acd699ae57ca7f433573915c",
+       "eec0130c4c206c01ccdee21ac17d49f3c7bf9805",
        []
       ],
       "wptlogging.py": [
@@ -492128,29 +492369,6 @@
       ]
      }
     },
-    "css-initial-letter": {
-     "initial-letter-computed.html": [
-      "e46306259a7088c3637597907a4b9f6d76933717",
-      [
-       null,
-       {}
-      ]
-     ],
-     "initial-letter-invalid.html": [
-      "574a347bda88b5bf6084bbd6485131ff1a3e8ae4",
-      [
-       null,
-       {}
-      ]
-     ],
-     "initial-letter-valid.html": [
-      "3c1e32811d80927b0e4017bfec3f98ef55f22fee",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
     "css-inline": {
      "inheritance.html": [
       "6723c2a6e2ff38cb0af2ab13baf5ef9a9af0f18a",
@@ -492159,6 +492377,29 @@
        {}
       ]
      ],
+     "initial-letter": {
+      "initial-letter-computed.html": [
+       "e46306259a7088c3637597907a4b9f6d76933717",
+       [
+        null,
+        {}
+       ]
+      ],
+      "initial-letter-invalid.html": [
+       "574a347bda88b5bf6084bbd6485131ff1a3e8ae4",
+       [
+        null,
+        {}
+       ]
+      ],
+      "initial-letter-valid.html": [
+       "3c1e32811d80927b0e4017bfec3f98ef55f22fee",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "inline-crash-chrome-001.html": [
       "cfc0fdd269fd334c8c76dfd357ff984df40e3064",
       [
@@ -515225,7 +515466,7 @@
        ]
       ],
       "scrollend-event-handler-content-attributes.html": [
-       "60e9da72c38d546dae1e29c0a9c1cc7e8e053584",
+       "47f563c39bd9072267529e72bd43c89948c9f962",
        [
         null,
         {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index 665ec4646cb..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 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/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index 147f062e548..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 5e3a96e5999..a057f038339 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,5 +8,8 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 4]
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
     expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
new file mode 100644
index 00000000000..b4eea326212
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-001.html]
+  [block-in-inline-hittest-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
index f9e216a8cfc..cdd8b55f192 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-relpos-zindex.html]
   [position: relative; z-index: -1;]
     expected: FAIL
-
-  [block-in-inline-hittest-relpos-zindex]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
index a22b1f33f9b..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
 
@@ -1121,4 +1120,3 @@
 
   [.flexbox 128]
     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 266774cabf0..25831b9b25d 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
@@ -50,18 +50,12 @@
   [Matching font-style: 'oblique 21deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 10deg' should prefer 'oblique 15deg 20deg' over 'oblique 30deg 60deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 0deg' should prefer 'oblique 0deg' over 'oblique 5deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
@@ -197,9 +191,6 @@
   [Matching font-weight: '399' should prefer '450 460' over '500 501']
     expected: FAIL
 
-  [Matching font-weight: '501' should prefer '502 510' over '503 520']
-    expected: FAIL
-
   [Matching font-style: 'oblique 20deg' should prefer 'oblique 40deg 50deg' over 'oblique 10deg']
     expected: FAIL
 
@@ -260,9 +251,6 @@
   [Matching font-weight: '400' should prefer '450 460' over '500']
     expected: FAIL
 
-  [Matching font-stretch: '110%' should prefer '105%' over '100%']
-    expected: FAIL
-
   [Matching font-weight: '500' should prefer '500' over '450 460']
     expected: FAIL
 
@@ -296,9 +284,6 @@
   [Matching font-stretch: '90%' should prefer '60% 70%' over '110% 140%']
     expected: FAIL
 
-  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 5deg 10deg' over 'oblique 5deg']
     expected: FAIL
 
@@ -310,3 +295,27 @@
 
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 21deg' over 'oblique 30deg 60deg']
     expected: FAIL
+
+  [Matching font-weight: '430' should prefer '500' over '400 425']
+    expected: FAIL
+
+  [Matching font-weight: '430' should prefer '340 398' over '501 550']
+    expected: FAIL
+
+  [Matching font-style: 'italic' should prefer 'oblique 0deg' over 'oblique -60deg -30deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -20deg' should prefer 'oblique -10deg' over 'italic']
+    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 dc6f99a5b15..73c4b4ace57 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,275 +53,302 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [background-color color(rgba) / values]
+  [padding-bottom length(ex) / values]
     expected: FAIL
 
-  [border-top-width length(pt) / values]
+  [padding-bottom length(mm) / values]
     expected: FAIL
 
-  [border-top-width length(pc) / values]
+  [padding-bottom length(cm) / values]
     expected: FAIL
 
-  [border-top-width length(px) / values]
+  [padding-bottom length(in) / values]
     expected: FAIL
 
-  [border-top-width length(em) / values]
+  [padding-left length(pt) / values]
     expected: FAIL
 
-  [border-top-width length(ex) / values]
+  [padding-left length(pc) / values]
     expected: FAIL
 
-  [border-top-width length(mm) / values]
+  [padding-left length(px) / values]
     expected: FAIL
 
-  [border-top-width length(cm) / values]
+  [padding-left length(em) / values]
     expected: FAIL
 
-  [border-top-width length(in) / values]
+  [padding-left length(ex) / values]
     expected: FAIL
 
-  [border-right-width length(pt) / values]
+  [padding-left length(mm) / values]
     expected: FAIL
 
-  [border-right-width length(pc) / values]
+  [padding-left length(cm) / values]
     expected: FAIL
 
-  [border-right-width length(px) / values]
+  [padding-left length(in) / values]
     expected: FAIL
 
-  [border-right-width length(em) / values]
+  [padding-right length(pt) / values]
     expected: FAIL
 
-  [border-right-width length(ex) / values]
+  [padding-right length(pc) / values]
     expected: FAIL
 
-  [border-right-width length(mm) / values]
+  [padding-right length(px) / values]
     expected: FAIL
 
-  [border-right-width length(cm) / values]
+  [padding-right length(em) / values]
     expected: FAIL
 
-  [border-right-width length(in) / values]
+  [padding-right length(ex) / values]
     expected: FAIL
 
-  [border-bottom-width length(pt) / values]
+  [padding-right length(mm) / values]
     expected: FAIL
 
-  [border-bottom-width length(pc) / values]
+  [padding-right length(cm) / values]
     expected: FAIL
 
-  [border-bottom-width length(px) / values]
+  [padding-right length(in) / values]
     expected: FAIL
 
-  [border-bottom-width length(em) / values]
+  [padding-top length(pt) / values]
     expected: FAIL
 
-  [border-bottom-width length(ex) / values]
+  [padding-top length(pc) / values]
     expected: FAIL
 
-  [border-bottom-width length(mm) / values]
+  [padding-top length(px) / values]
     expected: FAIL
 
-  [border-bottom-width length(cm) / values]
+  [padding-top length(em) / values]
     expected: FAIL
 
-  [border-bottom-width length(in) / values]
+  [padding-top length(ex) / values]
     expected: FAIL
 
-  [border-left-width length(pt) / values]
+  [padding-top length(mm) / values]
     expected: FAIL
 
-  [border-left-width length(pc) / values]
+  [padding-top length(cm) / values]
     expected: FAIL
 
-  [border-left-width length(px) / values]
+  [padding-top length(in) / values]
     expected: FAIL
 
-  [border-left-width length(em) / values]
+  [margin-bottom length(pt) / values]
     expected: FAIL
 
-  [border-left-width length(ex) / values]
+  [margin-bottom length(pc) / values]
     expected: FAIL
 
-  [border-left-width length(mm) / values]
+  [margin-bottom length(px) / values]
     expected: FAIL
 
-  [border-left-width length(cm) / values]
+  [margin-bottom length(em) / values]
     expected: FAIL
 
-  [border-left-width length(in) / values]
+  [margin-bottom length(ex) / values]
     expected: FAIL
 
-  [border-top-color color(rgba) / values]
+  [margin-bottom length(mm) / values]
     expected: FAIL
 
-  [border-right-color color(rgba) / values]
+  [margin-bottom length(cm) / values]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / values]
+  [margin-bottom length(in) / values]
     expected: FAIL
 
-  [border-left-color color(rgba) / values]
+  [margin-left length(pt) / values]
     expected: FAIL
 
-  [padding-bottom length(pt) / values]
+  [margin-left length(pc) / values]
     expected: FAIL
 
-  [padding-bottom length(pc) / values]
+  [margin-left length(px) / values]
     expected: FAIL
 
-  [padding-bottom length(px) / values]
+  [margin-left length(em) / values]
     expected: FAIL
 
-  [padding-bottom length(em) / values]
+  [margin-left length(ex) / values]
     expected: FAIL
 
-  [max-height length(ex) / values]
+  [margin-left length(mm) / values]
     expected: FAIL
 
-  [max-height length(mm) / values]
+  [margin-left length(cm) / values]
     expected: FAIL
 
-  [max-height length(cm) / values]
+  [margin-left length(in) / values]
     expected: FAIL
 
-  [max-height length(in) / values]
+  [margin-right length(pt) / values]
     expected: FAIL
 
-  [max-height percentage(%) / values]
+  [margin-right length(pc) / values]
     expected: FAIL
 
-  [max-width length(pt) / values]
+  [margin-right length(px) / values]
     expected: FAIL
 
-  [max-width length(pc) / values]
+  [margin-right length(em) / values]
     expected: FAIL
 
-  [max-width length(px) / values]
+  [margin-right length(ex) / values]
     expected: FAIL
 
-  [max-width length(em) / values]
+  [margin-right length(mm) / values]
     expected: FAIL
 
-  [max-width length(ex) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [max-width length(mm) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [max-width length(cm) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [max-width length(in) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [max-width percentage(%) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [top length(pt) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [top length(pc) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [top length(px) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [top length(em) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [top length(ex) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [top length(mm) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [top length(cm) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [top length(in) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [top percentage(%) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [right length(pt) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [right length(pc) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [right length(px) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [right length(em) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [right length(ex) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [right length(mm) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [right length(cm) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [right length(in) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [right percentage(%) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [bottom length(pt) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [bottom length(pc) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [bottom length(px) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [bottom length(em) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [bottom length(ex) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [bottom length(mm) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [bottom length(cm) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [bottom length(in) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [bottom percentage(%) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [left length(pt) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [left length(pc) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [left length(px) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [left length(em) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [left length(ex) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [left length(mm) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [left length(cm) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [left length(in) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [left percentage(%) / values]
+  [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 8769d9a909c..86c90d1d2b7 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
@@ -478,3 +478,303 @@
 
   [left percentage(%) / 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
+
+  [margin-right length(cm) / events]
+    expected: FAIL
+
+  [margin-right length(in) / events]
+    expected: FAIL
+
+  [margin-top length(pt) / events]
+    expected: FAIL
+
+  [margin-top length(pc) / events]
+    expected: FAIL
+
+  [margin-top length(px) / events]
+    expected: FAIL
+
+  [margin-top length(em) / events]
+    expected: FAIL
+
+  [margin-top length(ex) / events]
+    expected: FAIL
+
+  [margin-top length(mm) / events]
+    expected: FAIL
+
+  [margin-top length(cm) / events]
+    expected: FAIL
+
+  [margin-top length(in) / events]
+    expected: FAIL
+
+  [height length(pt) / events]
+    expected: FAIL
+
+  [height length(pc) / events]
+    expected: FAIL
+
+  [height length(px) / events]
+    expected: FAIL
+
+  [height length(em) / events]
+    expected: FAIL
+
+  [height length(ex) / events]
+    expected: FAIL
+
+  [height length(mm) / events]
+    expected: FAIL
+
+  [height length(cm) / events]
+    expected: FAIL
+
+  [height length(in) / events]
+    expected: FAIL
+
+  [height percentage(%) / events]
+    expected: FAIL
+
+  [width length(pt) / events]
+    expected: FAIL
+
+  [width length(pc) / events]
+    expected: FAIL
+
+  [width length(px) / events]
+    expected: FAIL
+
+  [width length(em) / events]
+    expected: FAIL
+
+  [width length(ex) / events]
+    expected: FAIL
+
+  [width length(mm) / events]
+    expected: FAIL
+
+  [width length(cm) / events]
+    expected: FAIL
+
+  [width length(in) / events]
+    expected: FAIL
+
+  [width percentage(%) / events]
+    expected: FAIL
+
+  [min-height length(pt) / events]
+    expected: FAIL
+
+  [min-height length(pc) / events]
+    expected: FAIL
+
+  [min-height length(px) / events]
+    expected: FAIL
+
+  [min-height length(em) / events]
+    expected: FAIL
+
+  [min-height length(ex) / events]
+    expected: FAIL
+
+  [min-height length(mm) / events]
+    expected: FAIL
+
+  [min-height length(cm) / events]
+    expected: FAIL
+
+  [min-height length(in) / events]
+    expected: FAIL
+
+  [min-height percentage(%) / events]
+    expected: FAIL
+
+  [min-width length(pt) / events]
+    expected: FAIL
+
+  [min-width length(pc) / events]
+    expected: FAIL
+
+  [min-width length(px) / events]
+    expected: FAIL
+
+  [min-width length(em) / events]
+    expected: FAIL
+
+  [min-width length(ex) / events]
+    expected: FAIL
+
+  [min-width length(mm) / events]
+    expected: FAIL
+
+  [min-width length(cm) / events]
+    expected: FAIL
+
+  [min-width length(in) / events]
+    expected: FAIL
+
+  [min-width percentage(%) / events]
+    expected: FAIL
+
+  [max-height length(pt) / events]
+    expected: FAIL
+
+  [max-height length(pc) / events]
+    expected: FAIL
+
+  [max-height length(px) / events]
+    expected: FAIL
+
+  [max-height length(em) / events]
+    expected: FAIL
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 5a107d55d99..d1bd3a0fa3a 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
@@ -325,3 +325,303 @@
 
   [margin-right length(mm) / values]
     expected: FAIL
+
+  [margin-right length(cm) / values]
+    expected: FAIL
+
+  [margin-right length(in) / values]
+    expected: FAIL
+
+  [margin-top length(pt) / values]
+    expected: FAIL
+
+  [margin-top length(pc) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [margin-top length(em) / values]
+    expected: FAIL
+
+  [margin-top length(ex) / values]
+    expected: FAIL
+
+  [margin-top length(mm) / values]
+    expected: FAIL
+
+  [margin-top length(cm) / values]
+    expected: FAIL
+
+  [margin-top length(in) / values]
+    expected: FAIL
+
+  [height length(pt) / values]
+    expected: FAIL
+
+  [height length(pc) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [height length(em) / values]
+    expected: FAIL
+
+  [height length(ex) / values]
+    expected: FAIL
+
+  [height length(mm) / values]
+    expected: FAIL
+
+  [height length(cm) / values]
+    expected: FAIL
+
+  [height length(in) / values]
+    expected: FAIL
+
+  [height percentage(%) / values]
+    expected: FAIL
+
+  [width length(pt) / values]
+    expected: FAIL
+
+  [width length(pc) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
+
+  [width length(em) / values]
+    expected: FAIL
+
+  [width length(ex) / values]
+    expected: FAIL
+
+  [width length(mm) / values]
+    expected: FAIL
+
+  [width length(cm) / values]
+    expected: FAIL
+
+  [width length(in) / values]
+    expected: FAIL
+
+  [width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [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-003.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini
index 2b8affa2206..0734ab0db2c 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-003.html.ini
@@ -4,90 +4,3 @@
 
   [background-position length-em(em) / values]
     expected: FAIL
-
-  [border-top-width length-em(em) / events]
-    expected: FAIL
-
-  [border-right-width length-em(em) / events]
-    expected: FAIL
-
-  [border-bottom-width length-em(em) / events]
-    expected: FAIL
-
-  [border-left-width length-em(em) / events]
-    expected: FAIL
-
-  [padding-bottom length-em(em) / events]
-    expected: FAIL
-
-  [padding-left length-em(em) / events]
-    expected: FAIL
-
-  [padding-right length-em(em) / events]
-    expected: FAIL
-
-  [padding-top length-em(em) / events]
-    expected: FAIL
-
-  [margin-bottom length-em(em) / events]
-    expected: FAIL
-
-  [margin-left length-em(em) / events]
-    expected: FAIL
-
-  [margin-right length-em(em) / events]
-    expected: FAIL
-
-  [margin-top length-em(em) / events]
-    expected: FAIL
-
-  [height length-em(em) / events]
-    expected: FAIL
-
-  [width length-em(em) / events]
-    expected: FAIL
-
-  [min-height length-em(em) / events]
-    expected: FAIL
-
-  [min-width length-em(em) / events]
-    expected: FAIL
-
-  [max-height length-em(em) / events]
-    expected: FAIL
-
-  [max-width length-em(em) / events]
-    expected: FAIL
-
-  [top length-em(em) / events]
-    expected: FAIL
-
-  [right length-em(em) / events]
-    expected: FAIL
-
-  [bottom length-em(em) / events]
-    expected: FAIL
-
-  [left length-em(em) / events]
-    expected: FAIL
-
-  [line-height length-em(em) / events]
-    expected: FAIL
-
-  [letter-spacing length-em(em) / events]
-    expected: FAIL
-
-  [word-spacing length-em(em) / events]
-    expected: FAIL
-
-  [text-indent length-em(em) / events]
-    expected: FAIL
-
-  [outline-offset length-em(em) / events]
-    expected: FAIL
-
-  [outline-width length-em(em) / events]
-    expected: FAIL
-
-  [vertical-align length-em(em) / events]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
deleted file mode 100644
index 7e9331b6bc2..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-float-in-relative.html]
-  [elementFromPoint-float-in-relative]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
index bd4f77fa2f1..8425141b736 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
@@ -14,8 +14,5 @@
   [<li>Outside 3</li>]
     expected: FAIL
 
-  [<li>Image Inside 1</li>]
-    expected: FAIL
-
-  [<li>Image Inside 2</li>]
+  [<li>Inside 2</li>]
     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 3285a4f15ac..ac656410273 100644
--- a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
@@ -76,3 +76,9 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
+
+  [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
+    expected: FAIL
+
+  [Input: "Content-Length: 30". Expected: 30.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 36a410bfecb..0d48169e3cc 100644
--- a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -147,5 +147,5 @@
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
 
-  [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: FAIL
+  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
+    expected: TIMEOUT
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 1bca09f21d6..c5fc1407992 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,4 +1,5 @@
 [iframe-src-aboutblank-navigate-immediately.html]
+  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
@@ -6,4 +7,4 @@
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: FAIL
+    expected: TIMEOUT
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 8298274f967..c07cbe00d9b 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
@@ -7,3 +7,6 @@
 
   [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='']
+    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 d70c1bd7ef5..d96b182328a 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
@@ -1,10 +1,19 @@
 [javascript-url-no-beforeunload.window.html]
   expected: TIMEOUT
   [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: 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: string completion]
     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-referrer.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
index bcda478adb1..5a245d61359 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
@@ -1,10 +1,6 @@
 [javascript-url-referrer.window.html]
-  expected: TIMEOUT
   [unsafe-url referrer policy used to create the starting page]
     expected: FAIL
 
   [origin referrer policy used to create the starting page]
     expected: FAIL
-
-  [no-referrer referrer policy used to create the starting page]
-    expected: TIMEOUT
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/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
new file mode 100644
index 00000000000..60a4fa51f8a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
@@ -0,0 +1,3 @@
+[a-click.html]
+  [aElement.click() before the load event must NOT replace]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
index f18f914e4a4..16371ab858d 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
@@ -1,3 +1,4 @@
 [form-submit.html]
+  expected: TIMEOUT
   [Replace before load, triggered by formElement.submit()]
-    expected: FAIL
+    expected: TIMEOUT
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 eacbe5794ea..fe55ddae3f1 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,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-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/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 76e34322dca..6bec7a732b8 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.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/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
new file mode 100644
index 00000000000..e06eefccd67
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -0,0 +1,9 @@
+[select-event.html]
+  [input type text: setSelectionRange() event queue]
+    expected: FAIL
+
+  [input type text: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd event queue]
+    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..d1c8dee6d6d 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
 
@@ -10,4 +11,7 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
new file mode 100644
index 00000000000..1181798bd79
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
@@ -0,0 +1,4 @@
+[async-script.html]
+
+[async-script.html?reload]
+  expected: ERROR
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-different-function-realm.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 7237f5792de..dbe1def99e3 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,4 +12,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index eed03df37f3..b7537329068 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/without-ports/018.html.ini
rename to tests/wpt/metadata/webmessaging/with-ports/018.html.ini
diff --git a/tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini b/tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
new file mode 100644
index 00000000000..aa6c9e5b826
--- /dev/null
+++ b/tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
@@ -0,0 +1,4 @@
+[localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html]
+  expected: TIMEOUT
+  [StorageKey: test 3P about:blank window opened from a 3P iframe]
+    expected: TIMEOUT
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-backgrounds/background-attachment-local-hidden.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local-hidden.html
new file mode 100644
index 00000000000..cbe3440e389
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local-hidden.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CSS Test: 'overflow: hidden' of 'Background-attachment' with value 'local'</title>
+<meta name="fuzzy" content="maxDifference=0-60; totalPixels=0-394">
+<link rel="author" title="Lin peng" href="mailto:penglin22@huawei.com" />
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#the-background-attachment" />
+<link rel="match" href="reference/background-attachment-local-hidden-ref.html">
+<style type="text/css">
+  div {
+    border: 10px solid rgba(255,0,0,0.5);
+    width: 100px;
+    height: 100px;
+    border-radius: 40px;
+    background-color: lightblue;
+    overflow: hidden;
+    background-attachment: local;
+  }
+</style>
+<div></div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html
new file mode 100644
index 00000000000..fc593c23cd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html
@@ -0,0 +1,23 @@
+<!doctype HTML>
+<style>
+  .outer {
+    position:relative;
+    width: 120px;
+    height: 120px;
+    border-radius: 40px;
+    background-color: rgba(255,0,0,0.5);
+  }
+
+  .inner {
+    position:absolute;
+    top:10px;
+    left:10px;
+    width: 100px;
+    height: 100px;
+    border-radius: 30px;
+    background-color: lightblue;
+  }
+</style>
+<div class = "outer">
+    <div class = "inner"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html
new file mode 100644
index 00000000000..74788e7f60c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc { columns: 2;}
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html
new file mode 100644
index 00000000000..c9ff86ee90f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation in RTL.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        direction: rtl;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: right;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc {
+        columns: 2;
+        direction: rtl;
+        height: 500px;
+        writing-mode: horizontal-tb;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: right;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html
new file mode 100644
index 00000000000..3f8327fda90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation in RTL.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="Initial-letter-breaking-rtl-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        direction: rtl;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: right;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc {
+        columns: 2;
+        direction: rtl;
+        height: 500px;
+        writing-mode: horizontal-tb;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html
new file mode 100644
index 00000000000..34856a52b14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation in vertical-lr.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-lr;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc {
+        columns: 2;
+        direction: ltr;
+        height: 500px;
+        writing-mode: vertical-lr;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-left: 8px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html
new file mode 100644
index 00000000000..c432ed81112
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation in vertical-lr.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="Initial-letter-breaking-vlr-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-lr;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc {
+        columns: 2;
+        direction: ltr;
+        height: 500px;
+        writing-mode: vertical-lr;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html
new file mode 100644
index 00000000000..6b0363b6841
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation in vertical-rl.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-rl;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc {
+        columns: 2;
+        direction: ltr;
+        height: 500px;
+        writing-mode: vertical-rl;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-right: 8px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample"><div class="fake-initial-letter"></div>BC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html
new file mode 100644
index 00000000000..e7d9c2ad908
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation in vertical-rl.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="Initial-letter-breaking-vrl-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-rl;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc {
+        columns: 2;
+        direction: ltr;
+        height: 500px;
+        writing-mode: vertical-rl;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking.html
new file mode 100644
index 00000000000..e6d15162eca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests interaction with fragmentation.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#Initial-letter-breaking">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="Initial-letter-breaking-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .mc { columns: 2;}
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="mc">
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+<div class="sample initial-letter">ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC ABC </div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-initial-letter/initial-letter-computed.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-computed.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-initial-letter/initial-letter-computed.html
rename to tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-computed.html
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html
new file mode 100644
index 00000000000..ebb90a64dd4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="sample"><div class="float"></div>
+<div class="fake-initial-letter"></div>
+bc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html
new file mode 100644
index 00000000000..62df03f30d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line in RTL</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        direction: rtl;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: right;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: right;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="sample"><div class="float"></div>
+<div class="fake-initial-letter"></div>
+bc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html
new file mode 100644
index 00000000000..96b28117714
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line in RTL</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-float-001-rtl-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        direction: rtl;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: right;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter"><div class="float"></div>
+Abc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html
new file mode 100644
index 00000000000..3982a3669cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line in vertical-lr</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-lr;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-left: 8px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="sample"><div class="float"></div>
+<div class="fake-initial-letter"></div>
+bc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html
new file mode 100644
index 00000000000..d9b98462d43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line in vertical-lr</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-float-001-vlr-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-lr;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter"><div class="float"></div>
+Abc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html
new file mode 100644
index 00000000000..816d8403bac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line in vertical-rl</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-rl;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-right: 8px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="sample"><div class="float"></div>
+<div class="fake-initial-letter"></div>
+bc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html
new file mode 100644
index 00000000000..850321fd751
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line in vertical-rl</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-float-001-vrl-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        height: 230px;
+        line-height: 24px;
+        writing-mode: vertical-rl;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter"><div class="float"></div>
+Abc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001.html
new file mode 100644
index 00000000000..76e83c6a939
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests initial letter should be part of the line</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-float-001-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter"><div class="float"></div>
+Abc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html
new file mode 100644
index 00000000000..df71adc04a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests adding the initial-letter to the exclusion-space</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: left;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        display: inline-block;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+
+    .surrounding {
+        display: inline-block;
+        margin-left: -20px;
+        vertical-align: top;
+    }
+
+    .surrounding2 {
+        display: block;
+        margin-left: 50px;
+        margin-top: -4px;
+        vertical-align: top;
+    }
+</style>
+</head>
+<body>
+<div class="sample"><div class="float"></div><div class="float"></div>
+<div class="fake-initial-letter"></div>
+<div class="surrounding">bc<br>def<br>ghi<br>jkl<br></div>
+<div class="surrounding2">mno</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002.html
new file mode 100644
index 00000000000..6f266ea0e05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests adding the initial-letter to the exclusion-space</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-float-002-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: left;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter"><div class="float"></div><div class="float"></div>
+Abc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-003-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-003-ref.html
new file mode 100644
index 00000000000..86770a93989
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-003-ref.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests float-avoidance in the block-direction</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: left;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-right: 10px;
+        margin-top: -36px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="sample">
+<div class="float"></div><div class="float" style="width:80px"></div>
+<div class="fake-initial-letter"></div>
+<div style="display:inline-block; margin-left:-10px;">
+bc<br>def<br>ghi<br>jkl<br></div>
+mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-003.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-003.html
new file mode 100644
index 00000000000..c16645fc0c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-003.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests float-avoidance in the block-direction</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-floats-003-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: left;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter">
+<div class="float"></div><div class="float" style="width:80px"></div>
+Abc<br>def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-004-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-004-ref.html
new file mode 100644
index 00000000000..76dab2b2b91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-004-ref.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests left floats should clear left initial-letters and visa-versa.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+</style>
+</head>
+<body>
+<div class="sample">
+<div class="fake-initial-letter"></div>
+bc<br>
+<div class="float" style="clear:left"></div>
+def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-004.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-004.html
new file mode 100644
index 00000000000..32beedf5f8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-004.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests left floats should clear left initial-letters and visa-versa.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-floats-004-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: none;
+        float: left;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter">
+Abc<br>
+<div class="float"></div>
+def<br>ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-005-ref.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-005-ref.html
new file mode 100644
index 00000000000..34112a1d403
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-005-ref.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests right float should be pushed on to next line.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: left;
+        float: right;
+        height: 50px;
+        width: 50px;
+    }
+
+    .fake-initial-letter {
+        background: lime;
+        float: left;
+        height: 80px;
+        margin-top: 14px;
+        width: 80px;
+    }
+    .float { margin-top: -70px; }
+</style>
+</head>
+<body>
+<div class="sample">
+<div class="fake-initial-letter"></div>
+bc def<div class="float" style="clear:left"></div><br>
+ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-005.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-005.html
new file mode 100644
index 00000000000..0ad557bff09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-floats-005.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests right float should be pushed on to next line.</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-inline/#initial-letter-floats">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" >
+<link rel="match" href="initial-letter-floats-005-ref.html">
+<style>
+    .sample {
+        border: solid 1px green;
+        font-family: Ahem;
+        font-size: 20px;
+        line-height: 24px;
+        width: 230px;
+    }
+
+    .float {
+        background: cyan;
+        clear: left;
+        float: right;
+        height: 50px;
+        width: 50px;
+    }
+
+    .initial-letter::first-letter {
+        initial-letter: 3 drop;
+        color: lime;
+        font-size: 100px;   /* should be ignored in rendering */
+        line-height: 50px;  /* should be ignored in rendering */
+    }
+</style>
+</head>
+<body>
+<div class="sample initial-letter">
+Abc def<div class="float"></div><br>
+ghi<br>jkl<br>mno<br>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-initial-letter/initial-letter-invalid.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-invalid.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-initial-letter/initial-letter-invalid.html
rename to tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-invalid.html
diff --git a/tests/wpt/web-platform-tests/css/css-initial-letter/initial-letter-valid.html b/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-valid.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-initial-letter/initial-letter-valid.html
rename to tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-valid.html
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html
index 60e9da72c38..47f563c39bd 100644
--- a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html
@@ -69,18 +69,21 @@ function runTest() {
     await waitForCompositorCommit();
     assert_equals(document.scrollingElement.scrollLeft, 200,
                   "Document scrolled on horizontal axis");
-    assert_equals(document.scrollingElement.scrollLeft, 200,
+    assert_equals(document.scrollingElement.scrollTop, 200,
                   "Document scrolled on vertical axis");
   }, "Tests scrollend event is not fired to document body event handler content attribute.");
 
   promise_test (async (t) => {
     await waitForCompositorCommit();
 
+    // Reset the scroll position.
+    document.scrollingElement.scrollTo({top: 0, left: 0});
+
     let scrollend_event = new Promise(resolve => document.onscrollend = resolve);
     document.scrollingElement.scrollTo({top: 200, left: 200});
     await scrollend_event;
 
-    assert_equals(document.scrollingElement.scrollLeft, 200,
+    assert_equals(document.scrollingElement.scrollTop, 200,
                   "Document scrolled on horizontal axis");
     assert_equals(document.scrollingElement.scrollLeft, 200,
                   "Document scrolled on vertical axis");
@@ -89,6 +92,9 @@ function runTest() {
   promise_test (async (t) => {
     await waitForCompositorCommit();
 
+    // Reset the scroll position.
+    target_div.scrollTo({top: 0, left: 0});
+
     let scrollend_event = new Promise(resolve => target_div.onscrollend = resolve);
     target_div.scrollTo({top: 200, left: 200});
     await scrollend_event;
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 36ab48a62b3..3e005ef0949 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -251,7 +251,7 @@ def get_environ(logger, binary, debug_info, stylo_threads, headless,
     # Disable window occlusion. Bug 1733955
     env["MOZ_WINDOW_OCCLUSION"] = "0"
     if chaos_mode_flags is not None:
-        env["MOZ_CHAOSMODE"] = str(chaos_mode_flags)
+        env["MOZ_CHAOSMODE"] = hex(chaos_mode_flags)
     if headless:
         env["MOZ_HEADLESS"] = "1"
     return env
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
index a909e044e73..6e418540b94 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -106,7 +106,7 @@ def get_environ(stylo_threads, chaos_mode_flags):
     env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"] = "1"
     env["STYLO_THREADS"] = str(stylo_threads)
     if chaos_mode_flags is not None:
-        env["MOZ_CHAOSMODE"] = str(chaos_mode_flags)
+        env["MOZ_CHAOSMODE"] = hex(chaos_mode_flags)
     return env
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 22ce8010a0e..eec0130c4c2 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -333,7 +333,7 @@ scheme host and port.""")
                              choices=["always", "fail", "unexpected"], default=None,
                              help="With --reftest-internal, when to take a screenshot")
     gecko_group.add_argument("--chaos", dest="chaos_mode_flags", action="store",
-                             nargs="?", const=0xFFFFFFFF, type=int,
+                             nargs="?", const=0xFFFFFFFF, type=lambda x: int(x, 16),
                              help="Enable chaos mode with the specified feature flag "
                              "(see http://searchfox.org/mozilla-central/source/mfbt/ChaosMode.h for "
                              "details). If no value is supplied, all features are activated")