diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 62c2d998e8f..68bf21994e8 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
new file mode 100644
index 00000000000..0842d0b5727
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-001.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-001.html]
+  [hit-test-floats-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..13bd6abf376
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
new file mode 100644
index 00000000000..b4eea326212
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-001.html]
+  [block-in-inline-hittest-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index ee34bc91078..51432362d66 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
-
-  [elementFromPoint]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
deleted file mode 100644
index 3e5096beef3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-hittest-float-002.html]
-  [block-in-inline-hittest-float-002]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
deleted file mode 100644
index 5b685485f3c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hittest-before-pseudo.html]
-  [Hit-testing text within a pseudo-element flex-item should return the flexbox as the hittest result.]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 4422b6fcf5a..e40924f077f 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
@@ -71,21 +71,12 @@
   [Matching font-weight: '399' should prefer '340 360' over '200 300']
     expected: FAIL
 
-  [Matching font-weight: '399' should prefer '400' over '450 460']
-    expected: FAIL
-
   [Matching font-weight: '399' should prefer '450 460' over '500 501']
     expected: FAIL
 
-  [Matching font-weight: '399' should prefer '500 501' over '502 510']
-    expected: FAIL
-
   [Matching font-stretch: '100%' should prefer '100%' over '110% 120%']
     expected: FAIL
 
-  [Matching font-stretch: '110%' should prefer '110% 120%' over '115% 116%']
-    expected: FAIL
-
   [Matching font-stretch: '110%' should prefer '115% 116%' over '105%']
     expected: FAIL
 
@@ -101,9 +92,6 @@
   [Matching font-stretch: '90%' should prefer '50% 80%' over '60% 70%']
     expected: FAIL
 
-  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'oblique 0deg' over 'oblique 10deg 40deg']
     expected: FAIL
 
@@ -113,9 +101,6 @@
   [Matching font-style: 'normal' should prefer 'oblique 20deg 30deg' over 'oblique -50deg -20deg']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'italic' over 'oblique 20deg']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 20deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
@@ -131,12 +116,6 @@
   [Matching font-style: 'oblique 20deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
-    expected: FAIL
-
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
@@ -179,9 +158,6 @@
   [Matching font-style: 'oblique -21deg' should prefer 'oblique 0deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'italic' over 'oblique -50deg -20deg']
     expected: FAIL
 
@@ -236,12 +212,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
     expected: FAIL
 
-  [Matching font-weight: '500' should prefer '500' over '450 460']
-    expected: FAIL
-
-  [Matching font-weight: '399' should prefer '200 300' over '400']
-    expected: FAIL
-
   [Matching font-style: 'oblique 20deg' should prefer 'oblique 10deg' over 'italic']
     expected: FAIL
 
@@ -293,12 +263,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
-    expected: FAIL
-
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
-    expected: FAIL
-
   [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
     expected: FAIL
 
@@ -310,3 +274,18 @@
 
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
     expected: FAIL
+
+  [Matching font-style: 'oblique 20deg' should prefer 'oblique 20deg' over 'oblique 30deg 60deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 10deg' over 'italic']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 10deg' over 'oblique 5deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'italic' over 'oblique 0deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-set/image-set-parsing.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-set/image-set-parsing.html.ini
index 7a0c7934dd4..a5e917ae298 100644
--- a/tests/wpt/metadata-layout-2020/css/css-images/image-set/image-set-parsing.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-set/image-set-parsing.html.ini
@@ -88,3 +88,33 @@
 
   [e.style['content'\] = "-webkit-image-set(url(\\"example.png\\") 192dpi, linear-gradient(black, white) 1x)" should set the property value]
     expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo), url(bar) 1x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo), url(bar) 1x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo) 1x, url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo) 1x, url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo), url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo), url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo) 1x, url(bar), url(baz) 2x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo) 1x, url(bar), url(baz) 2x)" should set the property value]
+    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 dba439bf82a..3094ea29f3c 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -202,276 +202,3 @@
 
   [margin-right length(mm) / values]
     expected: FAIL
-
-  [background-color color(rgba) / values]
-    expected: FAIL
-
-  [border-top-width length(pt) / values]
-    expected: FAIL
-
-  [border-top-width length(pc) / values]
-    expected: FAIL
-
-  [border-top-width length(px) / values]
-    expected: FAIL
-
-  [border-top-width length(em) / values]
-    expected: FAIL
-
-  [border-top-width length(ex) / values]
-    expected: FAIL
-
-  [border-top-width length(mm) / values]
-    expected: FAIL
-
-  [border-top-width length(cm) / values]
-    expected: FAIL
-
-  [border-top-width length(in) / values]
-    expected: FAIL
-
-  [border-right-width length(pt) / values]
-    expected: FAIL
-
-  [border-right-width length(pc) / values]
-    expected: FAIL
-
-  [border-right-width length(px) / values]
-    expected: FAIL
-
-  [border-right-width length(em) / values]
-    expected: FAIL
-
-  [border-right-width length(ex) / values]
-    expected: FAIL
-
-  [border-right-width length(mm) / values]
-    expected: FAIL
-
-  [border-right-width length(cm) / values]
-    expected: FAIL
-
-  [border-right-width length(in) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pc) / values]
-    expected: FAIL
-
-  [border-bottom-width length(px) / values]
-    expected: FAIL
-
-  [border-bottom-width length(em) / values]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / values]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(in) / values]
-    expected: FAIL
-
-  [border-left-width length(pt) / values]
-    expected: FAIL
-
-  [border-left-width length(pc) / values]
-    expected: FAIL
-
-  [border-left-width length(px) / values]
-    expected: FAIL
-
-  [border-left-width length(em) / values]
-    expected: FAIL
-
-  [border-left-width length(ex) / values]
-    expected: FAIL
-
-  [border-left-width length(mm) / values]
-    expected: FAIL
-
-  [border-left-width length(cm) / values]
-    expected: FAIL
-
-  [border-left-width length(in) / values]
-    expected: FAIL
-
-  [border-top-color color(rgba) / values]
-    expected: FAIL
-
-  [border-right-color color(rgba) / values]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / values]
-    expected: FAIL
-
-  [border-left-color color(rgba) / values]
-    expected: FAIL
-
-  [padding-bottom length(pt) / values]
-    expected: FAIL
-
-  [padding-bottom length(pc) / values]
-    expected: FAIL
-
-  [padding-bottom length(px) / values]
-    expected: FAIL
-
-  [padding-bottom length(em) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
index d30d024adec..605e472524d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,156 +56,6 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [padding-bottom length(ex) / events]
-    expected: FAIL
-
-  [padding-bottom length(mm) / events]
-    expected: FAIL
-
-  [padding-bottom length(cm) / events]
-    expected: FAIL
-
-  [padding-bottom length(in) / events]
-    expected: FAIL
-
-  [padding-left length(pt) / events]
-    expected: FAIL
-
-  [padding-left length(pc) / events]
-    expected: FAIL
-
-  [padding-left length(px) / events]
-    expected: FAIL
-
-  [padding-left length(em) / events]
-    expected: FAIL
-
-  [padding-left length(ex) / events]
-    expected: FAIL
-
-  [padding-left length(mm) / events]
-    expected: FAIL
-
-  [padding-left length(cm) / events]
-    expected: FAIL
-
-  [padding-left length(in) / events]
-    expected: FAIL
-
-  [padding-right length(pt) / events]
-    expected: FAIL
-
-  [padding-right length(pc) / events]
-    expected: FAIL
-
-  [padding-right length(px) / events]
-    expected: FAIL
-
-  [padding-right length(em) / events]
-    expected: FAIL
-
-  [padding-right length(ex) / events]
-    expected: FAIL
-
-  [padding-right length(mm) / events]
-    expected: FAIL
-
-  [padding-right length(cm) / events]
-    expected: FAIL
-
-  [padding-right length(in) / events]
-    expected: FAIL
-
-  [padding-top length(pt) / events]
-    expected: FAIL
-
-  [padding-top length(pc) / events]
-    expected: FAIL
-
-  [padding-top length(px) / events]
-    expected: FAIL
-
-  [padding-top length(em) / events]
-    expected: FAIL
-
-  [padding-top length(ex) / events]
-    expected: FAIL
-
-  [padding-top length(mm) / events]
-    expected: FAIL
-
-  [padding-top length(cm) / events]
-    expected: FAIL
-
-  [padding-top length(in) / events]
-    expected: FAIL
-
-  [margin-bottom length(pt) / events]
-    expected: FAIL
-
-  [margin-bottom length(pc) / events]
-    expected: FAIL
-
-  [margin-bottom length(px) / events]
-    expected: FAIL
-
-  [margin-bottom length(em) / events]
-    expected: FAIL
-
-  [margin-bottom length(ex) / events]
-    expected: FAIL
-
-  [margin-bottom length(mm) / events]
-    expected: FAIL
-
-  [margin-bottom length(cm) / events]
-    expected: FAIL
-
-  [margin-bottom length(in) / events]
-    expected: FAIL
-
-  [margin-left length(pt) / events]
-    expected: FAIL
-
-  [margin-left length(pc) / events]
-    expected: FAIL
-
-  [margin-left length(px) / events]
-    expected: FAIL
-
-  [margin-left length(em) / events]
-    expected: FAIL
-
-  [margin-left length(ex) / events]
-    expected: FAIL
-
-  [margin-left length(mm) / events]
-    expected: FAIL
-
-  [margin-left length(cm) / events]
-    expected: FAIL
-
-  [margin-left length(in) / events]
-    expected: FAIL
-
-  [margin-right length(pt) / events]
-    expected: FAIL
-
-  [margin-right length(pc) / events]
-    expected: FAIL
-
-  [margin-right length(px) / events]
-    expected: FAIL
-
-  [margin-right length(em) / events]
-    expected: FAIL
-
-  [margin-right length(ex) / events]
-    expected: FAIL
-
-  [margin-right length(mm) / events]
-    expected: FAIL
-
   [margin-right length(cm) / events]
     expected: FAIL
 
@@ -506,125 +356,152 @@
   [left percentage(%) / events]
     expected: FAIL
 
-  [background-color color(rgba) / events]
+  [color color(rgba) / events]
     expected: FAIL
 
-  [border-top-width length(pt) / events]
+  [font-size length(pt) / events]
     expected: FAIL
 
-  [border-top-width length(pc) / events]
+  [font-size length(pc) / events]
     expected: FAIL
 
-  [border-top-width length(px) / events]
+  [font-size length(px) / events]
     expected: FAIL
 
-  [border-top-width length(em) / events]
+  [font-size length(em) / events]
     expected: FAIL
 
-  [border-top-width length(ex) / events]
+  [font-size length(ex) / events]
     expected: FAIL
 
-  [border-top-width length(mm) / events]
+  [font-size length(mm) / events]
     expected: FAIL
 
-  [border-top-width length(cm) / events]
+  [font-size length(cm) / events]
     expected: FAIL
 
-  [border-top-width length(in) / events]
+  [font-size length(in) / events]
     expected: FAIL
 
-  [border-right-width length(pt) / events]
+  [font-size percentage(%) / events]
     expected: FAIL
 
-  [border-right-width length(pc) / events]
+  [font-weight font-weight(keyword) / events]
     expected: FAIL
 
-  [border-right-width length(px) / events]
+  [font-weight font-weight(numeric) / events]
     expected: FAIL
 
-  [border-right-width length(em) / events]
+  [line-height number(integer) / events]
     expected: FAIL
 
-  [border-right-width length(ex) / events]
+  [line-height number(decimal) / events]
     expected: FAIL
 
-  [border-right-width length(mm) / events]
+  [line-height length(pt) / events]
     expected: FAIL
 
-  [border-right-width length(cm) / events]
+  [line-height length(pc) / events]
     expected: FAIL
 
-  [border-right-width length(in) / events]
+  [line-height length(px) / events]
     expected: FAIL
 
-  [border-bottom-width length(pt) / events]
+  [line-height length(em) / events]
     expected: FAIL
 
-  [border-bottom-width length(pc) / events]
+  [line-height length(ex) / events]
     expected: FAIL
 
-  [border-bottom-width length(px) / events]
+  [line-height length(mm) / events]
     expected: FAIL
 
-  [border-bottom-width length(em) / events]
+  [line-height length(cm) / events]
     expected: FAIL
 
-  [border-bottom-width length(ex) / events]
+  [line-height length(in) / events]
     expected: FAIL
 
-  [border-bottom-width length(mm) / events]
+  [line-height percentage(%) / events]
     expected: FAIL
 
-  [border-bottom-width length(cm) / events]
+  [letter-spacing length(pt) / events]
     expected: FAIL
 
-  [border-bottom-width length(in) / events]
+  [letter-spacing length(pc) / events]
     expected: FAIL
 
-  [border-left-width length(pt) / events]
+  [letter-spacing length(px) / events]
     expected: FAIL
 
-  [border-left-width length(pc) / events]
+  [letter-spacing length(em) / events]
     expected: FAIL
 
-  [border-left-width length(px) / events]
+  [letter-spacing length(ex) / events]
     expected: FAIL
 
-  [border-left-width length(em) / events]
+  [letter-spacing length(mm) / events]
     expected: FAIL
 
-  [border-left-width length(ex) / events]
+  [letter-spacing length(cm) / events]
     expected: FAIL
 
-  [border-left-width length(mm) / events]
+  [letter-spacing length(in) / events]
     expected: FAIL
 
-  [border-left-width length(cm) / events]
+  [word-spacing length(pt) / events]
     expected: FAIL
 
-  [border-left-width length(in) / events]
+  [word-spacing length(pc) / events]
     expected: FAIL
 
-  [border-top-color color(rgba) / events]
+  [word-spacing length(px) / events]
     expected: FAIL
 
-  [border-right-color color(rgba) / events]
+  [word-spacing length(em) / events]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / events]
+  [word-spacing length(ex) / events]
     expected: FAIL
 
-  [border-left-color color(rgba) / events]
+  [word-spacing length(mm) / events]
     expected: FAIL
 
-  [padding-bottom length(pt) / events]
+  [word-spacing length(cm) / events]
     expected: FAIL
 
-  [padding-bottom length(pc) / events]
+  [word-spacing length(in) / events]
     expected: FAIL
 
-  [padding-bottom length(px) / events]
+  [word-spacing percentage(%) / events]
     expected: FAIL
 
-  [padding-bottom length(em) / events]
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
index 5a107d55d99..793afafa0e8 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
@@ -176,152 +176,152 @@
   [padding-bottom length(em) / values]
     expected: FAIL
 
-  [padding-bottom length(ex) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [padding-bottom length(mm) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [padding-bottom length(cm) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [padding-bottom length(in) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [padding-left length(pt) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [padding-left length(pc) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [padding-left length(px) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [padding-left length(em) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [padding-left length(ex) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [padding-left length(mm) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [padding-left length(cm) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [padding-left length(in) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [padding-right length(pt) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [padding-right length(pc) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [padding-right length(px) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [padding-right length(em) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [padding-right length(ex) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [padding-right length(mm) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [padding-right length(cm) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [padding-right length(in) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [padding-top length(pt) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [padding-top length(pc) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [padding-top length(px) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [padding-top length(em) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [padding-top length(ex) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [padding-top length(mm) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [padding-top length(cm) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [padding-top length(in) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [margin-bottom length(pt) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [margin-bottom length(pc) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [margin-bottom length(px) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [margin-bottom length(em) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [margin-bottom length(ex) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [margin-bottom length(mm) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [margin-bottom length(cm) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [margin-bottom length(in) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [margin-left length(pt) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [margin-left length(pc) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [margin-left length(px) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [margin-left length(em) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [margin-left length(ex) / values]
+  [text-indent length(pt) / values]
     expected: FAIL
 
-  [margin-left length(mm) / values]
+  [text-indent length(pc) / values]
     expected: FAIL
 
-  [margin-left length(cm) / values]
+  [text-indent length(px) / values]
     expected: FAIL
 
-  [margin-left length(in) / values]
+  [text-indent length(em) / values]
     expected: FAIL
 
-  [margin-right length(pt) / values]
+  [text-indent length(ex) / values]
     expected: FAIL
 
-  [margin-right length(pc) / values]
+  [text-indent length(mm) / values]
     expected: FAIL
 
-  [margin-right length(px) / values]
+  [text-indent length(cm) / values]
     expected: FAIL
 
-  [margin-right length(em) / values]
+  [text-indent length(in) / values]
     expected: FAIL
 
-  [margin-right length(ex) / values]
+  [text-indent percentage(%) / values]
     expected: FAIL
 
-  [margin-right length(mm) / values]
+  [text-shadow shadow(shadow) / values]
     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 e1cdb2ac923..8d25c050330 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,14 +14,8 @@
   [<li>Outside 1</li>]
     expected: FAIL
 
-  [<li>Inside 2</li>]
-    expected: FAIL
-
   [<li>Inside 3</li>]
     expected: FAIL
 
   [<li>Image Inside 1</li>]
     expected: FAIL
-
-  [<li>Image Inside 2</li>]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini
deleted file mode 100644
index 8f6f663ba61..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-subpixel.html]
-  [Hit test top left corner of box]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/dom/events/webkit-transition-end-event.html.ini b/tests/wpt/metadata-layout-2020/dom/events/webkit-transition-end-event.html.ini
index c909dd22076..b7fe8688a23 100644
--- a/tests/wpt/metadata-layout-2020/dom/events/webkit-transition-end-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/dom/events/webkit-transition-end-event.html.ini
@@ -1,5 +1,4 @@
 [webkit-transition-end-event.html]
-  expected: TIMEOUT
   [dispatchEvent of an transitionend event does not trigger a prefixed event handler or listener]
     expected: FAIL
 
@@ -26,6 +25,3 @@
 
   [onwebkittransitionend event handler should not trigger if an unprefixed event handler also exists]
     expected: FAIL
-
-  [webkitTransitionEnd event listener is case sensitive]
-    expected: TIMEOUT
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 2ece7dfad7d..3285a4f15ac 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
@@ -76,9 +76,3 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
-
-  [Input: "Content-Length: 30". Expected: 30.]
-    expected: FAIL
-
-  [Input: "Content-Length: 42,42". Expected: 42.]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index e25b13de8d0..8edde75f4d0 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -308,6 +308,3 @@
 
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
-
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 9d4eb6f8399..5b0339c7ad6 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -10,3 +10,6 @@
 
   [X-Content-Type-Options%3A%20%22nosniFF%22]
     expected: FAIL
+
+  [X-Content-Type-Options%3A%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
index 1d68034a37d..ab9ac6e835e 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -1,12 +1,13 @@
 [failure-check-sequence.https.html]
+  expected: TIMEOUT
   [CSP check precedes COEP check - CSP header first]
-    expected: FAIL
+    expected: NOTRUN
 
   [COEP check precedes X-Frame-Options check]
-    expected: FAIL
+    expected: NOTRUN
 
   [CSP check precedes COEP check - COEP header first]
-    expected: FAIL
+    expected: NOTRUN
 
   [CSP check precedes X-Frame-Options check]
-    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 f6e6619721f..51fd557bd7f 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -5,8 +5,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank?foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
-    expected: FAIL
-
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 324db3d9b35..5aef7ce66ce 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,3 +10,6 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
+
+  [load event does not fire on window.open('about:blank')]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..78240a2f463 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -16,6 +16,3 @@
 
   [D83D DE0D set in href="" targeting a frame and clicked]
     expected: FAIL
-
-  [DE0D 0041 set in href="" targeting a frame and clicked]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
new file mode 100644
index 00000000000..7dc346632a4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
@@ -0,0 +1,3 @@
+[navigation-unload-same-origin.window.html]
+  [Same-origin navigation started from unload handler must be ignored]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..7a5fcb79165
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,3 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..4b4820d1729
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,3 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index ddd65fdcec8..bc228cfd2a2 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -9,7 +10,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 7d28d586f51..f455bb20528 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_escaping-1.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/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 26704422bbe..841bafc6eca 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,4 +1,3 @@
 [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: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 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/forms/form-submission-0/text-plain.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/text-plain.window.js.ini
index 74524ee024b..200022641d0 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/text-plain.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/text-plain.window.js.ini
@@ -172,3 +172,9 @@
 
   [text/plain: 0x00 in filename (formdata event)]
     expected: FAIL
+
+  [text/plain: double quote in value (normal form)]
+    expected: FAIL
+
+  [text/plain: backslash in name (formdata event)]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
index 5175cf8483a..49af9f7d555 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
@@ -175,3 +175,6 @@
 
   [application/x-www-form-urlencoded: 0x00 in name (formdata event)]
     expected: FAIL
+
+  [application/x-www-form-urlencoded: Basic test (formdata event)]
+    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..5b2bee4b0a5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -0,0 +1,12 @@
+[select-event.html]
+  [input type text: setRangeText() disconnected node]
+    expected: FAIL
+
+  [input type tel: selectionEnd twice in disconnected node (must fire select only once)]
+    expected: FAIL
+
+  [input type tel: setRangeText() disconnected node]
+    expected: FAIL
+
+  [input type password: setRangeText() 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 90317c9bf28..7f099cec1b0 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,13 +1,9 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
-
-  [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index 53acb938c1b..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
deleted file mode 100644
index f9a4f08cd70..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-tla-delayed.html]
-  [document.write in an imported module]
-    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/resource-timing/content-type-parsing.html.ini b/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
index dea574899ad..49b17a921b5 100644
--- a/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/metadata-layout-2020/resource-timing/content-type-parsing.html.ini
@@ -61,40 +61,40 @@
     expected: FAIL
 
   [mime-type 1 : text/html;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 2 : TEXT/HTML;CHARSET=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 4 : text/html;charset=gbk(]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 5 : text/html;x=(;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 7 : text/html;charset=gbk;charset=windows-1255]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 8 : text/html;charset=();charset=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 10 : text/html;charset =gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 11 : text/html ;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 12 : text/html; charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 13 : text/html;charset= gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 14 : text/html;charset= "gbk"]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 16 : text/html;charset=\x0bgbk]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [mime-type 17 : text/html;charset=\x0cgbk]
     expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index 282ab0b2525..cdeaf7f7080 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 316fcb107f9..9158f967e8a 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -174403,7 +174403,7 @@
       ]
      ],
      "font-size-adjust-012.html": [
-      "a6037ffbaceeb68e0806d951f1c12fb38b646b2c",
+      "57519edf18faef75ae8366af6174ad35a1c16aea",
       [
        null,
        [
@@ -176218,7 +176218,7 @@
       ]
      ],
      "size-adjust-02.html": [
-      "3255b5ccaf010251668ee05467dbb3f5bbb041f8",
+      "e849191310578ae06dabd15e9187af3166cc1eaa",
       [
        null,
        [
@@ -176517,7 +176517,7 @@
       ]
      ],
      "system-ui-ar.html": [
-      "edc327add65736f37af58a59fc6bb0e020c23752",
+      "a65a564f9bae9729c033c3de8d51bf4ae2fab2fb",
       [
        null,
        [
@@ -176530,7 +176530,7 @@
       ]
      ],
      "system-ui-ja-vs-zh.html": [
-      "2fbd2b3e173fb615bdc8725e029dbbefcda7989a",
+      "f3700697d5f23df31fc1b9307ea68a87ce2dc846",
       [
        null,
        [
@@ -176543,7 +176543,7 @@
       ]
      ],
      "system-ui-ja.html": [
-      "ff249e486be2fee22696f9bd68b6b802b2bd29f2",
+      "2b16fe005c6a1acd8d242fb7fbdc7ea5971aebc6",
       [
        null,
        [
@@ -176569,7 +176569,7 @@
       ]
      ],
      "system-ui-ur-vs-ar.html": [
-      "451d2a03eaf1ba1e72a3aebba07b6b2071205626",
+      "210534fd869b90020079e26453709fac15a7d907",
       [
        null,
        [
@@ -176582,7 +176582,7 @@
       ]
      ],
      "system-ui-ur.html": [
-      "9a8cccfcd827cdd0255784be7356917e69ffcd35",
+      "bd26d29720b89141ebff8c874b8116ce71358045",
       [
        null,
        [
@@ -176595,7 +176595,7 @@
       ]
      ],
      "system-ui-zh.html": [
-      "fbd52f2dec12db4dae2ccabd9f6b11163bc41e77",
+      "c99a39331618a29d82dad0a18cdf94ad6cf0d991",
       [
        null,
        [
@@ -187588,6 +187588,19 @@
         {}
        ]
       ],
+      "image-set-no-res-rendering-2.html": [
+       "2cb98bb9c2e0dd69440f67af83473ee9a628084c",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-set/reference/image-set-rendering-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "image-set-no-res-rendering.html": [
        "927d4c67f1da268a55ce5008c9f84123031ba521",
        [
@@ -319246,6 +319259,82 @@
      "34edb7b82b9657e0beaf9b1669d0854d365770ed",
      []
     ],
+    "inner-delegation": {
+     "accept_ch_delegation_to_all.sub.https.html.headers": [
+      "a8b1708b9d23e62af9c82319b46e8facc42bd051",
+      []
+     ],
+     "accept_ch_delegation_to_none.sub.https.html.headers": [
+      "0b260a43f07700ab0b52d759037414e97f60c21b",
+      []
+     ],
+     "accept_ch_delegation_to_self.sub.https.html.headers": [
+      "3b9de86bbd5bd0c67056029f1c52727b470cd88d",
+      []
+     ],
+     "accept_ch_delegation_to_some.sub.https.html.sub.headers": [
+      "24fe4e84c8e6844fbfe1c287fb651b7580e97d36",
+      []
+     ],
+     "accept_ch_delegation_to_src.sub.https.html.headers": [
+      "3b9de86bbd5bd0c67056029f1c52727b470cd88d",
+      []
+     ],
+     "resources": {
+      "accept_ch_delegation_to_all_iframe.sub.https.html": [
+       "09df9ec46fe4ed7e7bfcd022e004b316e544e054",
+       []
+      ],
+      "accept_ch_delegation_to_all_iframe_iframe.sub.https.html": [
+       "4291ae954c88eedec6856567badff7e23600abec",
+       []
+      ],
+      "accept_ch_delegation_to_none_iframe.sub.https.html": [
+       "cd88fa54fc71742724f2da89f8d48ea12e016709",
+       []
+      ],
+      "accept_ch_delegation_to_none_iframe_iframe.sub.https.html": [
+       "5d661f4b15f84e7562d0a715d1d9a21bf7b865a9",
+       []
+      ],
+      "accept_ch_delegation_to_self_iframe.sub.https.html": [
+       "92157f49892acad230451c100a093fd3fdae8795",
+       []
+      ],
+      "accept_ch_delegation_to_self_iframe_iframe.sub.https.html": [
+       "e12759e07635a561e679bb1e3ac8b6b5e31db344",
+       []
+      ],
+      "accept_ch_delegation_to_some_iframe.sub.https.html": [
+       "39a430723023f7a5c0343ecd0c824dbe26785b5b",
+       []
+      ],
+      "accept_ch_delegation_to_some_iframe.sub.https.html.headers": [
+       "3e53702c6e30eedabce12093d21dca387d241bcf",
+       []
+      ],
+      "accept_ch_delegation_to_some_iframe_iframe.sub.https.html": [
+       "999e3b6c99f87b541ddda2a7153ea04e3aaeecb2",
+       []
+      ],
+      "accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers": [
+       "e8ccc92f5118c78ab9eac47c8213a92cf057b9df",
+       []
+      ],
+      "accept_ch_delegation_to_src_iframe.sub.https.html": [
+       "05d1db9fc99f96e025a21f41a5e10dd20a7f3ae3",
+       []
+      ],
+      "accept_ch_delegation_to_src_iframe_iframe.sub.https.html": [
+       "497a19161f1a786e615a1cbb576ae3485171da89",
+       []
+      ],
+      "was-sec-ch-device-memory-received.py": [
+       "f57e121252d7293fa72f7707b28f19cb9e86cc28",
+       []
+      ]
+     }
+    },
     "meta-equiv-delegate-ch-merge.https.html.headers": [
      "34edb7b82b9657e0beaf9b1669d0854d365770ed",
      []
@@ -367912,7 +368001,7 @@
       []
      ],
      "size-adjust-02-ref.html": [
-      "44bf8a130bea06a037de837fdd9d4fe4b0292d81",
+      "85b213076cab51bab343234833835ca0e413581f",
       []
      ],
      "size-adjust-tentative-ref.html": [
@@ -374096,11 +374185,11 @@
       ]
      },
      "system-ui-ar-notref.html": [
-      "e21bbd22fdb169bc94d3a39490c556838e10e5d4",
+      "76a216ca7439a37190a38bc70cd5abc91432df77",
       []
      ],
      "system-ui-ja-notref.html": [
-      "d3da976dcbb0280e93521a2086edd101baa29d96",
+      "c33e769ce330b9d3fc5e314e0b065a81bf54200c",
       []
      ],
      "system-ui-mixed-ref.html": [
@@ -374112,11 +374201,11 @@
       []
      ],
      "system-ui-ur-notref.html": [
-      "bba395fc3e998e9e9280014cfd41525d4a078b1d",
+      "90529ea4ac1ad7a6711e47657d69b5a488a56c3f",
       []
      ],
      "system-ui-zh-notref.html": [
-      "49a7204a34012dc6c6ffaf84f44e34ff5f5c444c",
+      "ca072086c415b058264e495c46cb4a692d8a0684",
       []
      ],
      "test-synthetic-italic-2-ref.html": [
@@ -380735,7 +380824,7 @@
      ],
      "resources": {
       "utils.js": [
-       "c9a0c73828f12cde80df54880802914501af1895",
+       "005723e70154eb866397f8b65fab8d5c91ef4e90",
        []
       ]
      },
@@ -471222,6 +471311,43 @@
       {}
      ]
     ],
+    "inner-delegation": {
+     "accept_ch_delegation_to_all.sub.https.html": [
+      "27ce76302dc9933b705930d0e3ca4de6414ef2b6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "accept_ch_delegation_to_none.sub.https.html": [
+      "1d4bfffe0a860b168e8b02c07ef1f925f2710f98",
+      [
+       null,
+       {}
+      ]
+     ],
+     "accept_ch_delegation_to_self.sub.https.html": [
+      "9647a8741ae999c180c856b30ba5d267b2e1bb4a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "accept_ch_delegation_to_some.sub.https.html": [
+      "9ea0049c391739a43ee8ec6c588c324673bc95e3",
+      [
+       null,
+       {}
+      ]
+     ],
+     "accept_ch_delegation_to_src.sub.https.html": [
+      "e01853e5e916dccf146fe514f61ef4d791cd8cad",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "meta-equiv-delegate-ch-iframe.https.html": [
      "2ce9c63c18a6a9455e31bf96dba82097056ccbd2",
      [
@@ -495045,7 +495171,7 @@
        ]
       ],
       "image-set-parsing.html": [
-       "4877ba975fde31389876f3aa93e899b789286bca",
+       "b9b335a287b8a3ed9194ac6a4d80ef6c94ab7ef3",
        [
         null,
         {}
@@ -498275,6 +498401,20 @@
       ]
      ],
      "animation": {
+      "custom-property-animation-angle-comma-list.html": [
+       "a14b0bb09ee56b3e7f328d8b8de7ac550ce7cbd0",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-angle-space-list.html": [
+       "8ce7a9deabe9562041b1ea860e351ddade8348e5",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-angle.html": [
        "0cb06aef0bd825629c9d253824f2e783dc8b84c9",
        [
@@ -498282,6 +498422,20 @@
         {}
        ]
       ],
+      "custom-property-animation-color-comma-list.html": [
+       "7148df07248265530141b0853d7eb84cb7319d91",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-color-space-list.html": [
+       "679e244667c6711fbc9eeb72536369d628a7b664",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-color.html": [
        "001fc407e7ba96a277de1a6558883d8fd0ac23a0",
        [
@@ -498290,14 +498444,14 @@
        ]
       ],
       "custom-property-animation-custom-ident.html": [
-       "3f210f914b35806461c87ff7080d067c41702211",
+       "5bc2bed34368d8bc26116edaa9c39623be9459b5",
        [
         null,
         {}
        ]
       ],
       "custom-property-animation-image.html": [
-       "935d3025d4a64c049bb8ad5d6246fd1dbfe3c36a",
+       "4f9505f9a8ee681277818c5952495622ce38332f",
        [
         null,
         {}
@@ -498310,6 +498464,20 @@
         {}
        ]
       ],
+      "custom-property-animation-integer-comma-list.html": [
+       "3f4beaedf1c65cb8069d324ca519aef1020efef6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-integer-space-list.html": [
+       "89feb3af150835cee0699ee5fc52a0f39cd640f2",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-integer.html": [
        "400308a92eadaea6fc158ebd6e6528e333a061ad",
        [
@@ -498317,6 +498485,27 @@
         {}
        ]
       ],
+      "custom-property-animation-length-comma-list.html": [
+       "6f1fefb76fcce08ba944543f1a4635bf90cfe8ba",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-length-percentage-comma-list.html": [
+       "bf3e75b79174bd63eb4b927c38078260acad5c33",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-length-percentage-space-list.html": [
+       "9497093b6eeeb293d8bc015189f965200e9c4c04",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-length-percentage.html": [
        "096efd6ba7f8f9d741a8f67589ed6e7c3029047b",
        [
@@ -498324,6 +498513,13 @@
         {}
        ]
       ],
+      "custom-property-animation-length-space-list.html": [
+       "102259a070affcc004eca721a5862851dfb3fdf0",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-length.html": [
        "8849bf52d6651338444ea4b8024e4233d36f29f4",
        [
@@ -498338,6 +498534,20 @@
         {}
        ]
       ],
+      "custom-property-animation-number-comma-list.html": [
+       "937b6caeeb312c076fb2d2f7f28b1d2a6f2a3808",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-number-space-list.html": [
+       "61f177eb05d867db91acf24b4f33085a3d44af9d",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-number.html": [
        "ea28acacf680fc2b45fcb93ab4d380fbd7bceadd",
        [
@@ -498345,6 +498555,20 @@
         {}
        ]
       ],
+      "custom-property-animation-percentage-comma-list.html": [
+       "c69004664619ce495e4b9f2523579976a72a1767",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-percentage-space-list.html": [
+       "d012b851fdba7687618ea440dadf5babd4022dd0",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-percentage.html": [
        "6af498e702550fb6f98a9aebc591410d93213f05",
        [
@@ -498352,6 +498576,20 @@
         {}
        ]
       ],
+      "custom-property-animation-resolution-comma-list.html": [
+       "22201947ff97e0c0656a42b1195973a2c099989c",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-resolution-space-list.html": [
+       "d4765d4e32bd43aad3dc3182183da1b9b7d7a259",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-resolution.html": [
        "3d05139edcadfb926ce031347565082d318cd5c8",
        [
@@ -498359,6 +498597,20 @@
         {}
        ]
       ],
+      "custom-property-animation-time-comma-list.html": [
+       "bf07baf1308cf4e0db3d0f680e07145d85efcc12",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-time-space-list.html": [
+       "c0fe206ea7e5a1f64dc2f610ce91d6b3b96ec8cd",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-time.html": [
        "b9f5984db7c53fb3294714c4c9d6cd5c8a43e019",
        [
@@ -498373,8 +498625,22 @@
         {}
        ]
       ],
+      "custom-property-animation-transform-list-multiple-values.html": [
+       "9ffaec830f8eae0a58fbadb64038b10af1efda64",
+       [
+        null,
+        {}
+       ]
+      ],
+      "custom-property-animation-transform-list-single-values.html": [
+       "b9bce6dd0b2cae8c0b5eaadc1d74fd95b142c8ba",
+       [
+        null,
+        {}
+       ]
+      ],
       "custom-property-animation-url.html": [
-       "00ea48557feff9fd343bbe3a27810e8fea28bcf9",
+       "830b9e1f4966b865c6bc1b5bde6358f335685ea3",
        [
         null,
         {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
new file mode 100644
index 00000000000..0842d0b5727
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-001.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-001.html]
+  [hit-test-floats-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..13bd6abf376
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,3 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
new file mode 100644
index 00000000000..b4eea326212
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-001.html]
+  [block-in-inline-hittest-001]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index ee34bc91078..51432362d66 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
-
-  [elementFromPoint]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
deleted file mode 100644
index 3e5096beef3..00000000000
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-hittest-float-002.html]
-  [block-in-inline-hittest-float-002]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/hittest-before-pseudo.html.ini b/tests/wpt/metadata/css/css-flexbox/hittest-before-pseudo.html.ini
deleted file mode 100644
index 5b685485f3c..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/hittest-before-pseudo.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hittest-before-pseudo.html]
-  [Hit-testing text within a pseudo-element flex-item should return the flexbox as the hittest result.]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index a56b4f755c3..75b1f12c97c 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
@@ -26,21 +26,12 @@
   [Matching font-weight: '500' should prefer '501 550' over '502 560']
     expected: FAIL
 
-  [Matching font-weight: '399' should prefer '400' over '450 460']
-    expected: FAIL
-
-  [Matching font-style: 'italic' should prefer 'italic' over 'oblique 20deg']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 40deg 50deg' over 'oblique 5deg 10deg']
     expected: FAIL
 
   [Matching font-style: 'italic' should prefer 'oblique -60deg -30deg' over 'oblique -50deg -40deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
@@ -62,9 +53,6 @@
   [Matching font-style: 'oblique 20deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
-    expected: FAIL
-
   [Descriptor mathcing priority: Style has higher priority than weight]
     expected: FAIL
 
@@ -116,15 +104,9 @@
   [Matching font-style: 'oblique -21deg' should prefer 'oblique 0deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
-  [Matching font-stretch: '110%' should prefer '110% 120%' over '115% 116%']
-    expected: FAIL
-
   [Matching font-style: 'oblique 20deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 10deg' should prefer 'italic' over 'oblique 0deg']
     expected: FAIL
 
@@ -161,15 +143,9 @@
   [Matching font-weight: '399' should prefer '350 399' over '340 360']
     expected: FAIL
 
-  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
-    expected: FAIL
-
   [Matching font-weight: '500' should prefer '400' over '350 399']
     expected: FAIL
 
-  [Matching font-weight: '399' should prefer '500 501' over '502 510']
-    expected: FAIL
-
   [Matching font-weight: '500' should prefer '350 399' over '351 398']
     expected: FAIL
 
@@ -245,12 +221,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
     expected: FAIL
 
-  [Matching font-weight: '500' should prefer '500' over '450 460']
-    expected: FAIL
-
-  [Matching font-weight: '399' should prefer '200 300' over '400']
-    expected: FAIL
-
   [Matching font-style: 'oblique 20deg' should prefer 'oblique 10deg' over 'italic']
     expected: FAIL
 
@@ -302,12 +272,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
-    expected: FAIL
-
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
-    expected: FAIL
-
   [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
     expected: FAIL
 
@@ -319,3 +283,18 @@
 
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
     expected: FAIL
+
+  [Matching font-style: 'oblique 20deg' should prefer 'oblique 20deg' over 'oblique 30deg 60deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 10deg' over 'italic']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 10deg' over 'oblique 5deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'italic' over 'oblique 0deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini b/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini
index 8aeebffeed4..d3ab9f70811 100644
--- a/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini
+++ b/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini
@@ -121,3 +121,33 @@
 
   [e.style['content'\] = "-webkit-image-set(url(\\"example.png\\") 192dpi, linear-gradient(black, white) 1x)" should set the property value]
     expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo), url(bar) 1x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo), url(bar) 1x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo) 1x, url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo) 1x, url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo), url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo), url(bar))" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(foo) 1x, url(bar), url(baz) 2x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(foo) 1x, url(bar), url(baz) 2x)" should set the property value]
+    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 dba439bf82a..3094ea29f3c 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -202,276 +202,3 @@
 
   [margin-right length(mm) / values]
     expected: FAIL
-
-  [background-color color(rgba) / values]
-    expected: FAIL
-
-  [border-top-width length(pt) / values]
-    expected: FAIL
-
-  [border-top-width length(pc) / values]
-    expected: FAIL
-
-  [border-top-width length(px) / values]
-    expected: FAIL
-
-  [border-top-width length(em) / values]
-    expected: FAIL
-
-  [border-top-width length(ex) / values]
-    expected: FAIL
-
-  [border-top-width length(mm) / values]
-    expected: FAIL
-
-  [border-top-width length(cm) / values]
-    expected: FAIL
-
-  [border-top-width length(in) / values]
-    expected: FAIL
-
-  [border-right-width length(pt) / values]
-    expected: FAIL
-
-  [border-right-width length(pc) / values]
-    expected: FAIL
-
-  [border-right-width length(px) / values]
-    expected: FAIL
-
-  [border-right-width length(em) / values]
-    expected: FAIL
-
-  [border-right-width length(ex) / values]
-    expected: FAIL
-
-  [border-right-width length(mm) / values]
-    expected: FAIL
-
-  [border-right-width length(cm) / values]
-    expected: FAIL
-
-  [border-right-width length(in) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pt) / values]
-    expected: FAIL
-
-  [border-bottom-width length(pc) / values]
-    expected: FAIL
-
-  [border-bottom-width length(px) / values]
-    expected: FAIL
-
-  [border-bottom-width length(em) / values]
-    expected: FAIL
-
-  [border-bottom-width length(ex) / values]
-    expected: FAIL
-
-  [border-bottom-width length(mm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(cm) / values]
-    expected: FAIL
-
-  [border-bottom-width length(in) / values]
-    expected: FAIL
-
-  [border-left-width length(pt) / values]
-    expected: FAIL
-
-  [border-left-width length(pc) / values]
-    expected: FAIL
-
-  [border-left-width length(px) / values]
-    expected: FAIL
-
-  [border-left-width length(em) / values]
-    expected: FAIL
-
-  [border-left-width length(ex) / values]
-    expected: FAIL
-
-  [border-left-width length(mm) / values]
-    expected: FAIL
-
-  [border-left-width length(cm) / values]
-    expected: FAIL
-
-  [border-left-width length(in) / values]
-    expected: FAIL
-
-  [border-top-color color(rgba) / values]
-    expected: FAIL
-
-  [border-right-color color(rgba) / values]
-    expected: FAIL
-
-  [border-bottom-color color(rgba) / values]
-    expected: FAIL
-
-  [border-left-color color(rgba) / values]
-    expected: FAIL
-
-  [padding-bottom length(pt) / values]
-    expected: FAIL
-
-  [padding-bottom length(pc) / values]
-    expected: FAIL
-
-  [padding-bottom length(px) / values]
-    expected: FAIL
-
-  [padding-bottom length(em) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
index d30d024adec..605e472524d 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,156 +56,6 @@
   [background-position length(px) / events]
     expected: FAIL
 
-  [padding-bottom length(ex) / events]
-    expected: FAIL
-
-  [padding-bottom length(mm) / events]
-    expected: FAIL
-
-  [padding-bottom length(cm) / events]
-    expected: FAIL
-
-  [padding-bottom length(in) / events]
-    expected: FAIL
-
-  [padding-left length(pt) / events]
-    expected: FAIL
-
-  [padding-left length(pc) / events]
-    expected: FAIL
-
-  [padding-left length(px) / events]
-    expected: FAIL
-
-  [padding-left length(em) / events]
-    expected: FAIL
-
-  [padding-left length(ex) / events]
-    expected: FAIL
-
-  [padding-left length(mm) / events]
-    expected: FAIL
-
-  [padding-left length(cm) / events]
-    expected: FAIL
-
-  [padding-left length(in) / events]
-    expected: FAIL
-
-  [padding-right length(pt) / events]
-    expected: FAIL
-
-  [padding-right length(pc) / events]
-    expected: FAIL
-
-  [padding-right length(px) / events]
-    expected: FAIL
-
-  [padding-right length(em) / events]
-    expected: FAIL
-
-  [padding-right length(ex) / events]
-    expected: FAIL
-
-  [padding-right length(mm) / events]
-    expected: FAIL
-
-  [padding-right length(cm) / events]
-    expected: FAIL
-
-  [padding-right length(in) / events]
-    expected: FAIL
-
-  [padding-top length(pt) / events]
-    expected: FAIL
-
-  [padding-top length(pc) / events]
-    expected: FAIL
-
-  [padding-top length(px) / events]
-    expected: FAIL
-
-  [padding-top length(em) / events]
-    expected: FAIL
-
-  [padding-top length(ex) / events]
-    expected: FAIL
-
-  [padding-top length(mm) / events]
-    expected: FAIL
-
-  [padding-top length(cm) / events]
-    expected: FAIL
-
-  [padding-top length(in) / events]
-    expected: FAIL
-
-  [margin-bottom length(pt) / events]
-    expected: FAIL
-
-  [margin-bottom length(pc) / events]
-    expected: FAIL
-
-  [margin-bottom length(px) / events]
-    expected: FAIL
-
-  [margin-bottom length(em) / events]
-    expected: FAIL
-
-  [margin-bottom length(ex) / events]
-    expected: FAIL
-
-  [margin-bottom length(mm) / events]
-    expected: FAIL
-
-  [margin-bottom length(cm) / events]
-    expected: FAIL
-
-  [margin-bottom length(in) / events]
-    expected: FAIL
-
-  [margin-left length(pt) / events]
-    expected: FAIL
-
-  [margin-left length(pc) / events]
-    expected: FAIL
-
-  [margin-left length(px) / events]
-    expected: FAIL
-
-  [margin-left length(em) / events]
-    expected: FAIL
-
-  [margin-left length(ex) / events]
-    expected: FAIL
-
-  [margin-left length(mm) / events]
-    expected: FAIL
-
-  [margin-left length(cm) / events]
-    expected: FAIL
-
-  [margin-left length(in) / events]
-    expected: FAIL
-
-  [margin-right length(pt) / events]
-    expected: FAIL
-
-  [margin-right length(pc) / events]
-    expected: FAIL
-
-  [margin-right length(px) / events]
-    expected: FAIL
-
-  [margin-right length(em) / events]
-    expected: FAIL
-
-  [margin-right length(ex) / events]
-    expected: FAIL
-
-  [margin-right length(mm) / events]
-    expected: FAIL
-
   [margin-right length(cm) / events]
     expected: FAIL
 
@@ -506,125 +356,152 @@
   [left percentage(%) / events]
     expected: FAIL
 
-  [background-color color(rgba) / events]
+  [color color(rgba) / events]
     expected: FAIL
 
-  [border-top-width length(pt) / events]
+  [font-size length(pt) / events]
     expected: FAIL
 
-  [border-top-width length(pc) / events]
+  [font-size length(pc) / events]
     expected: FAIL
 
-  [border-top-width length(px) / events]
+  [font-size length(px) / events]
     expected: FAIL
 
-  [border-top-width length(em) / events]
+  [font-size length(em) / events]
     expected: FAIL
 
-  [border-top-width length(ex) / events]
+  [font-size length(ex) / events]
     expected: FAIL
 
-  [border-top-width length(mm) / events]
+  [font-size length(mm) / events]
     expected: FAIL
 
-  [border-top-width length(cm) / events]
+  [font-size length(cm) / events]
     expected: FAIL
 
-  [border-top-width length(in) / events]
+  [font-size length(in) / events]
     expected: FAIL
 
-  [border-right-width length(pt) / events]
+  [font-size percentage(%) / events]
     expected: FAIL
 
-  [border-right-width length(pc) / events]
+  [font-weight font-weight(keyword) / events]
     expected: FAIL
 
-  [border-right-width length(px) / events]
+  [font-weight font-weight(numeric) / events]
     expected: FAIL
 
-  [border-right-width length(em) / events]
+  [line-height number(integer) / events]
     expected: FAIL
 
-  [border-right-width length(ex) / events]
+  [line-height number(decimal) / events]
     expected: FAIL
 
-  [border-right-width length(mm) / events]
+  [line-height length(pt) / events]
     expected: FAIL
 
-  [border-right-width length(cm) / events]
+  [line-height length(pc) / events]
     expected: FAIL
 
-  [border-right-width length(in) / events]
+  [line-height length(px) / events]
     expected: FAIL
 
-  [border-bottom-width length(pt) / events]
+  [line-height length(em) / events]
     expected: FAIL
 
-  [border-bottom-width length(pc) / events]
+  [line-height length(ex) / events]
     expected: FAIL
 
-  [border-bottom-width length(px) / events]
+  [line-height length(mm) / events]
     expected: FAIL
 
-  [border-bottom-width length(em) / events]
+  [line-height length(cm) / events]
     expected: FAIL
 
-  [border-bottom-width length(ex) / events]
+  [line-height length(in) / events]
     expected: FAIL
 
-  [border-bottom-width length(mm) / events]
+  [line-height percentage(%) / events]
     expected: FAIL
 
-  [border-bottom-width length(cm) / events]
+  [letter-spacing length(pt) / events]
     expected: FAIL
 
-  [border-bottom-width length(in) / events]
+  [letter-spacing length(pc) / events]
     expected: FAIL
 
-  [border-left-width length(pt) / events]
+  [letter-spacing length(px) / events]
     expected: FAIL
 
-  [border-left-width length(pc) / events]
+  [letter-spacing length(em) / events]
     expected: FAIL
 
-  [border-left-width length(px) / events]
+  [letter-spacing length(ex) / events]
     expected: FAIL
 
-  [border-left-width length(em) / events]
+  [letter-spacing length(mm) / events]
     expected: FAIL
 
-  [border-left-width length(ex) / events]
+  [letter-spacing length(cm) / events]
     expected: FAIL
 
-  [border-left-width length(mm) / events]
+  [letter-spacing length(in) / events]
     expected: FAIL
 
-  [border-left-width length(cm) / events]
+  [word-spacing length(pt) / events]
     expected: FAIL
 
-  [border-left-width length(in) / events]
+  [word-spacing length(pc) / events]
     expected: FAIL
 
-  [border-top-color color(rgba) / events]
+  [word-spacing length(px) / events]
     expected: FAIL
 
-  [border-right-color color(rgba) / events]
+  [word-spacing length(em) / events]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / events]
+  [word-spacing length(ex) / events]
     expected: FAIL
 
-  [border-left-color color(rgba) / events]
+  [word-spacing length(mm) / events]
     expected: FAIL
 
-  [padding-bottom length(pt) / events]
+  [word-spacing length(cm) / events]
     expected: FAIL
 
-  [padding-bottom length(pc) / events]
+  [word-spacing length(in) / events]
     expected: FAIL
 
-  [padding-bottom length(px) / events]
+  [word-spacing percentage(%) / events]
     expected: FAIL
 
-  [padding-bottom length(em) / events]
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
     expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index 5a107d55d99..793afafa0e8 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
@@ -176,152 +176,152 @@
   [padding-bottom length(em) / values]
     expected: FAIL
 
-  [padding-bottom length(ex) / values]
+  [color color(rgba) / values]
     expected: FAIL
 
-  [padding-bottom length(mm) / values]
+  [font-size length(pt) / values]
     expected: FAIL
 
-  [padding-bottom length(cm) / values]
+  [font-size length(pc) / values]
     expected: FAIL
 
-  [padding-bottom length(in) / values]
+  [font-size length(px) / values]
     expected: FAIL
 
-  [padding-left length(pt) / values]
+  [font-size length(em) / values]
     expected: FAIL
 
-  [padding-left length(pc) / values]
+  [font-size length(ex) / values]
     expected: FAIL
 
-  [padding-left length(px) / values]
+  [font-size length(mm) / values]
     expected: FAIL
 
-  [padding-left length(em) / values]
+  [font-size length(cm) / values]
     expected: FAIL
 
-  [padding-left length(ex) / values]
+  [font-size length(in) / values]
     expected: FAIL
 
-  [padding-left length(mm) / values]
+  [font-size percentage(%) / values]
     expected: FAIL
 
-  [padding-left length(cm) / values]
+  [font-weight font-weight(keyword) / values]
     expected: FAIL
 
-  [padding-left length(in) / values]
+  [font-weight font-weight(numeric) / values]
     expected: FAIL
 
-  [padding-right length(pt) / values]
+  [line-height number(integer) / values]
     expected: FAIL
 
-  [padding-right length(pc) / values]
+  [line-height number(decimal) / values]
     expected: FAIL
 
-  [padding-right length(px) / values]
+  [line-height length(pt) / values]
     expected: FAIL
 
-  [padding-right length(em) / values]
+  [line-height length(pc) / values]
     expected: FAIL
 
-  [padding-right length(ex) / values]
+  [line-height length(px) / values]
     expected: FAIL
 
-  [padding-right length(mm) / values]
+  [line-height length(em) / values]
     expected: FAIL
 
-  [padding-right length(cm) / values]
+  [line-height length(ex) / values]
     expected: FAIL
 
-  [padding-right length(in) / values]
+  [line-height length(mm) / values]
     expected: FAIL
 
-  [padding-top length(pt) / values]
+  [line-height length(cm) / values]
     expected: FAIL
 
-  [padding-top length(pc) / values]
+  [line-height length(in) / values]
     expected: FAIL
 
-  [padding-top length(px) / values]
+  [line-height percentage(%) / values]
     expected: FAIL
 
-  [padding-top length(em) / values]
+  [letter-spacing length(pt) / values]
     expected: FAIL
 
-  [padding-top length(ex) / values]
+  [letter-spacing length(pc) / values]
     expected: FAIL
 
-  [padding-top length(mm) / values]
+  [letter-spacing length(px) / values]
     expected: FAIL
 
-  [padding-top length(cm) / values]
+  [letter-spacing length(em) / values]
     expected: FAIL
 
-  [padding-top length(in) / values]
+  [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [margin-bottom length(pt) / values]
+  [letter-spacing length(mm) / values]
     expected: FAIL
 
-  [margin-bottom length(pc) / values]
+  [letter-spacing length(cm) / values]
     expected: FAIL
 
-  [margin-bottom length(px) / values]
+  [letter-spacing length(in) / values]
     expected: FAIL
 
-  [margin-bottom length(em) / values]
+  [word-spacing length(pt) / values]
     expected: FAIL
 
-  [margin-bottom length(ex) / values]
+  [word-spacing length(pc) / values]
     expected: FAIL
 
-  [margin-bottom length(mm) / values]
+  [word-spacing length(px) / values]
     expected: FAIL
 
-  [margin-bottom length(cm) / values]
+  [word-spacing length(em) / values]
     expected: FAIL
 
-  [margin-bottom length(in) / values]
+  [word-spacing length(ex) / values]
     expected: FAIL
 
-  [margin-left length(pt) / values]
+  [word-spacing length(mm) / values]
     expected: FAIL
 
-  [margin-left length(pc) / values]
+  [word-spacing length(cm) / values]
     expected: FAIL
 
-  [margin-left length(px) / values]
+  [word-spacing length(in) / values]
     expected: FAIL
 
-  [margin-left length(em) / values]
+  [word-spacing percentage(%) / values]
     expected: FAIL
 
-  [margin-left length(ex) / values]
+  [text-indent length(pt) / values]
     expected: FAIL
 
-  [margin-left length(mm) / values]
+  [text-indent length(pc) / values]
     expected: FAIL
 
-  [margin-left length(cm) / values]
+  [text-indent length(px) / values]
     expected: FAIL
 
-  [margin-left length(in) / values]
+  [text-indent length(em) / values]
     expected: FAIL
 
-  [margin-right length(pt) / values]
+  [text-indent length(ex) / values]
     expected: FAIL
 
-  [margin-right length(pc) / values]
+  [text-indent length(mm) / values]
     expected: FAIL
 
-  [margin-right length(px) / values]
+  [text-indent length(cm) / values]
     expected: FAIL
 
-  [margin-right length(em) / values]
+  [text-indent length(in) / values]
     expected: FAIL
 
-  [margin-right length(ex) / values]
+  [text-indent percentage(%) / values]
     expected: FAIL
 
-  [margin-right length(mm) / values]
+  [text-shadow shadow(shadow) / values]
     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 390e170437a..23a8be4dfce 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,14 +14,8 @@
   [<li>Outside 3</li>]
     expected: FAIL
 
-  [<li>Inside 2</li>]
-    expected: FAIL
-
   [<li>Inside 3</li>]
     expected: FAIL
 
   [<li>Image Inside 1</li>]
     expected: FAIL
-
-  [<li>Image Inside 2</li>]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
deleted file mode 100644
index 8f6f663ba61..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-subpixel.html]
-  [Hit test top left corner of box]
-    expected: FAIL
diff --git a/tests/wpt/metadata/dom/events/webkit-transition-end-event.html.ini b/tests/wpt/metadata/dom/events/webkit-transition-end-event.html.ini
index c909dd22076..b7fe8688a23 100644
--- a/tests/wpt/metadata/dom/events/webkit-transition-end-event.html.ini
+++ b/tests/wpt/metadata/dom/events/webkit-transition-end-event.html.ini
@@ -1,5 +1,4 @@
 [webkit-transition-end-event.html]
-  expected: TIMEOUT
   [dispatchEvent of an transitionend event does not trigger a prefixed event handler or listener]
     expected: FAIL
 
@@ -26,6 +25,3 @@
 
   [onwebkittransitionend event handler should not trigger if an unprefixed event handler also exists]
     expected: FAIL
-
-  [webkitTransitionEnd event listener is case sensitive]
-    expected: TIMEOUT
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 2ece7dfad7d..3285a4f15ac 100644
--- a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
@@ -76,9 +76,3 @@
 
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
-
-  [Input: "Content-Length: 30". Expected: 30.]
-    expected: FAIL
-
-  [Input: "Content-Length: 42,42". Expected: 42.]
-    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 8c466d54595..f5ba8274138 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -308,6 +308,3 @@
 
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
-
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 9d4eb6f8399..5b0339c7ad6 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -10,3 +10,6 @@
 
   [X-Content-Type-Options%3A%20%22nosniFF%22]
     expected: FAIL
+
+  [X-Content-Type-Options%3A%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
index 1d68034a37d..ab9ac6e835e 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -1,12 +1,13 @@
 [failure-check-sequence.https.html]
+  expected: TIMEOUT
   [CSP check precedes COEP check - CSP header first]
-    expected: FAIL
+    expected: NOTRUN
 
   [COEP check precedes X-Frame-Options check]
-    expected: FAIL
+    expected: NOTRUN
 
   [CSP check precedes COEP check - COEP header first]
-    expected: FAIL
+    expected: NOTRUN
 
   [CSP check precedes X-Frame-Options check]
-    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 f6e6619721f..51fd557bd7f 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -5,8 +5,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank?foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
-    expected: FAIL
-
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 324db3d9b35..5aef7ce66ce 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,3 +10,6 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
+
+  [load event does not fire on window.open('about:blank')]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..78240a2f463 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -16,6 +16,3 @@
 
   [D83D DE0D set in href="" targeting a frame and clicked]
     expected: FAIL
-
-  [DE0D 0041 set in href="" targeting a frame and clicked]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
new file mode 100644
index 00000000000..7dc346632a4
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
@@ -0,0 +1,3 @@
+[navigation-unload-same-origin.window.html]
+  [Same-origin navigation started from unload handler must be ignored]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..7a5fcb79165
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,3 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..4b4820d1729
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,3 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d169bd2e9fa..8acae84e1e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -9,7 +10,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 25d9964f057..e5994e21efc 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/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 26704422bbe..841bafc6eca 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,4 +1,3 @@
 [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: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 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/forms/form-submission-0/text-plain.window.js.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/text-plain.window.js.ini
index 74524ee024b..200022641d0 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/text-plain.window.js.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/text-plain.window.js.ini
@@ -172,3 +172,9 @@
 
   [text/plain: 0x00 in filename (formdata event)]
     expected: FAIL
+
+  [text/plain: double quote in value (normal form)]
+    expected: FAIL
+
+  [text/plain: backslash in name (formdata event)]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
index 5175cf8483a..49af9f7d555 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
@@ -175,3 +175,6 @@
 
   [application/x-www-form-urlencoded: 0x00 in name (formdata event)]
     expected: FAIL
+
+  [application/x-www-form-urlencoded: Basic test (formdata event)]
+    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..5b2bee4b0a5
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -0,0 +1,12 @@
+[select-event.html]
+  [input type text: setRangeText() disconnected node]
+    expected: FAIL
+
+  [input type tel: selectionEnd twice in disconnected node (must fire select only once)]
+    expected: FAIL
+
+  [input type tel: setRangeText() disconnected node]
+    expected: FAIL
+
+  [input type password: setRangeText() 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 2d44172f4dc..071b4378add 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -8,10 +7,7 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
-
-  [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index 53acb938c1b..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
deleted file mode 100644
index f9a4f08cd70..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-tla-delayed.html]
-  [document.write in an imported module]
-    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/resource-timing/content-type-parsing.html.ini b/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
index dea574899ad..49b17a921b5 100644
--- a/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/metadata/resource-timing/content-type-parsing.html.ini
@@ -61,40 +61,40 @@
     expected: FAIL
 
   [mime-type 1 : text/html;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 2 : TEXT/HTML;CHARSET=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 4 : text/html;charset=gbk(]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 5 : text/html;x=(;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 7 : text/html;charset=gbk;charset=windows-1255]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 8 : text/html;charset=();charset=GBK]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 10 : text/html;charset =gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 11 : text/html ;charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 12 : text/html; charset=gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 13 : text/html;charset= gbk]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 14 : text/html;charset= "gbk"]
-    expected: NOTRUN
+    expected: FAIL
 
   [mime-type 16 : text/html;charset=\x0bgbk]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [mime-type 17 : text/html;charset=\x0cgbk]
     expected: NOTRUN
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html
new file mode 100644
index 00000000000..27ce76302dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Client Hints: Delegation of hints to cross-origin frames and resources for *</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Here's the set-up for this test:
+// Step 1. (Site 1 Window) verify ch-device-memory availability.
+// Step 2. (Site 1 Window) set up listener and embed Site 2 Frame.
+// Step 3. (Site 2 Frame) verify ch-device-memory availability.
+// Step 4. (Site 2 Frame) embeds Site 1 Frame.
+// Step 5. (Site 3 Frame) verify ch-device-memory availability.
+// Step 6. (Site 1 Window) exit.
+
+promise_test(async (t) => {
+  // Step 1
+  let r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 1 didn't recieve sec-ch-device-memory");
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 2 didn't recieve sec-ch-device-memory");
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 3 didn't recieve sec-ch-device-memory");
+  // Step 2
+  const site2Frame = document.createElement("iframe");
+  site2Frame.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html";
+  site2Frame.allow = "ch-device-memory *"
+  document.body.appendChild(site2Frame);
+  // Step 6
+  return new Promise(resolve => {
+    window.addEventListener("message", resolve);
+  }).then(e => {
+    assert_equals(e.data, "ch-device-memory is available as expected for all");
+  });
+}, "postMessage: First-Party to Third-Party, Cross-Partition, Same-Origin");
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers
new file mode 100644
index 00000000000..a8b1708b9d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: ch-device-memory=(*)
+Accept-CH: Sec-CH-Device-Memory
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html
new file mode 100644
index 00000000000..1d4bfffe0a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Client Hints: Delegation of hints to cross-origin frames and resources for none</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Here's the set-up for this test:
+// Step 1. (Site 1 Window) verify ch-device-memory availability.
+// Step 2. (Site 1 Window) set up listener and embed Site 2 Frame.
+// Step 3. (Site 2 Frame) verify ch-device-memory availability.
+// Step 4. (Site 2 Frame) embeds Site 1 Frame.
+// Step 5. (Site 3 Frame) verify ch-device-memory availability.
+// Step 6. (Site 1 Window) exit.
+
+promise_test(async (t) => {
+  // Step 1
+  let r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 1 did recieve sec-ch-device-memory");
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 2 did recieve sec-ch-device-memory");
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 3 did recieve sec-ch-device-memory");
+  // Step 2
+  const site2Frame = document.createElement("iframe");
+  site2Frame.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html";
+  document.body.appendChild(site2Frame);
+  // Step 6
+  return new Promise(resolve => {
+    window.addEventListener("message", resolve);
+  }).then(e => {
+    assert_equals(e.data, "ch-device-memory is available as expected for none");
+  });
+}, "postMessage: First-Party to Third-Party, Cross-Partition, Same-Origin");
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers
new file mode 100644
index 00000000000..0b260a43f07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: ch-device-memory=()
+Accept-CH: Sec-CH-Device-Memory
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html
new file mode 100644
index 00000000000..9647a8741ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Client Hints: Delegation of hints to cross-origin frames and resources for self</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Here's the set-up for this test:
+// Step 1. (Site 1 Window) verify ch-device-memory availability.
+// Step 2. (Site 1 Window) set up listener and embed Site 2 Frame.
+// Step 3. (Site 2 Frame) verify ch-device-memory availability.
+// Step 4. (Site 2 Frame) embeds Site 1 Frame.
+// Step 5. (Site 3 Frame) verify ch-device-memory availability.
+// Step 6. (Site 1 Window) exit.
+
+promise_test(async (t) => {
+  // Step 1
+  let r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 1 didn't recieve sec-ch-device-memory");
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 2 did recieve sec-ch-device-memory");
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 3 did recieve sec-ch-device-memory");
+  // Step 2
+  const site2Frame = document.createElement("iframe");
+  site2Frame.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html";
+  site2Frame.allow = "ch-device-memory self"
+  document.body.appendChild(site2Frame);
+  // Step 6
+  return new Promise(resolve => {
+    window.addEventListener("message", resolve);
+  }).then(e => {
+    assert_equals(e.data, "ch-device-memory is available as expected for self");
+  });
+}, "postMessage: First-Party to Third-Party, Cross-Partition, Same-Origin");
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers
new file mode 100644
index 00000000000..3b9de86bbd5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: ch-device-memory=(self)
+Accept-CH: Sec-CH-Device-Memory
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html
new file mode 100644
index 00000000000..9ea0049c391
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Client Hints: Delegation of hints to cross-origin frames and resources for some</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Here's the set-up for this test:
+// Step 1. (Site 1 Window) verify ch-device-memory availability.
+// Step 2. (Site 1 Window) set up listener and embed Site 2 Frame.
+// Step 3. (Site 2 Frame) verify ch-device-memory availability.
+// Step 4. (Site 2 Frame) embeds Site 1 Frame.
+// Step 5. (Site 3 Frame) verify ch-device-memory availability.
+// Step 6. (Site 1 Window) exit.
+
+promise_test(async (t) => {
+  // Step 1
+  let r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 1 didn't recieve sec-ch-device-memory");
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 2 didn't recieve sec-ch-device-memory");
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 3 did recieve sec-ch-device-memory");
+  // Step 2
+  const site2Frame = document.createElement("iframe");
+  site2Frame.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html";
+  site2Frame.allow = "ch-device-memory https://{{hosts[alt][]}}:{{ports[https][0]}}"
+  document.body.appendChild(site2Frame);
+  // Step 6
+  return new Promise(resolve => {
+    window.addEventListener("message", resolve);
+  }).then(e => {
+    assert_equals(e.data, "ch-device-memory is available as expected for some");
+  });
+}, "postMessage: First-Party to Third-Party, Cross-Partition, Same-Origin");
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers
new file mode 100644
index 00000000000..24fe4e84c8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: ch-device-memory=("https://{{host}}:{{ports[https][0]}}" "https://{{hosts[alt][]}}:{{ports[https][0]}}")
+Accept-CH: Sec-CH-Device-Memory
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html
new file mode 100644
index 00000000000..e01853e5e91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Client Hints: Delegation of hints to cross-origin frames and resources for src</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+// Here's the set-up for this test:
+// Step 1. (Site 1 Window) verify ch-device-memory availability.
+// Step 2. (Site 1 Window) set up listener and embed Site 2 Frame.
+// Step 3. (Site 2 Frame) verify ch-device-memory availability.
+// Step 4. (Site 2 Frame) embeds Site 1 Frame.
+// Step 5. (Site 3 Frame) verify ch-device-memory availability.
+// Step 6. (Site 1 Window) exit.
+
+promise_test(async (t) => {
+  // Step 1
+  let r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 200, "Site 1 fetching Site 1 didn't recieve sec-ch-device-memory");
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 2 did recieve sec-ch-device-memory");
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  assert_equals(r.status, 400, "Site 1 fetching Site 3 did recieve sec-ch-device-memory");
+  // Step 2
+  const site2Frame = document.createElement("iframe");
+  site2Frame.src = "https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html";
+  site2Frame.allow = "ch-device-memory src"
+  document.body.appendChild(site2Frame);
+  // Step 6
+  return new Promise(resolve => {
+    window.addEventListener("message", resolve);
+  }).then(e => {
+    assert_equals(e.data, "ch-device-memory is available as expected for src");
+  });
+}, "postMessage: First-Party to Third-Party, Cross-Partition, Same-Origin");
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers
new file mode 100644
index 00000000000..3b9de86bbd5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: ch-device-memory=(self)
+Accept-CH: Sec-CH-Device-Memory
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html
new file mode 100644
index 00000000000..09df9ec46fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 3 (client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status != 200) {
+    return "Site 2 fetching Site 2 didn't recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  // Step 4 (client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html)
+  const site3Frame = document.createElement("iframe");
+  site3Frame.src = "https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html";
+  site3Frame.allow = "ch-device-memory *"
+  document.body.appendChild(site3Frame);
+  return ""
+}
+test().then((message) => {
+  if (message) {
+    window.top.postMessage(message, "*");
+  }
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html
new file mode 100644
index 00000000000..4291ae954c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 5 (client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status != 200) {
+    return "Site 3 fetching Site 3 didn't recieve sec-ch-device-memory";
+  }
+  return "ch-device-memory is available as expected for all"
+}
+test().then((message) => window.top.postMessage(message, "*"));
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html
new file mode 100644
index 00000000000..cd88fa54fc7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 3 (client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  // Step 4 (client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html)
+  const site3Frame = document.createElement("iframe");
+  site3Frame.src = "https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html";
+  site3Frame.allow = "ch-device-memory none"
+  document.body.appendChild(site3Frame);
+  return ""
+}
+test().then((message) => {
+  if (message) {
+    window.top.postMessage(message, "*");
+  }
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html
new file mode 100644
index 00000000000..5d661f4b15f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 5 (client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  return "ch-device-memory is available as expected for none"
+}
+test().then((message) => window.top.postMessage(message, "*"));
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html
new file mode 100644
index 00000000000..92157f49892
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 3 (client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  // Step 4 (client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html)
+  const site3Frame = document.createElement("iframe");
+  site3Frame.src = "https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html";
+  site3Frame.allow = "ch-device-memory self"
+  document.body.appendChild(site3Frame);
+  return ""
+}
+test().then((message) => {
+  if (message) {
+    window.top.postMessage(message, "*");
+  }
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html
new file mode 100644
index 00000000000..e12759e0763
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 5 (client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  return "ch-device-memory is available as expected for self"
+}
+test().then((message) => window.top.postMessage(message, "*"));
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html
new file mode 100644
index 00000000000..39a43072302
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 3 (client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status != 200) {
+    return "Site 2 fetching Site 1 didn't recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status != 200) {
+    return "Site 2 fetching Site 2 didn't recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status != 200) {
+    return "Site 2 fetching Site 3 didn't  recieve sec-ch-device-memory";
+  }
+  // Step 4 (client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html)
+  const site3Frame = document.createElement("iframe");
+  site3Frame.src = "https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html";
+  site3Frame.allow = "ch-device-memory https://{{domains[www2]}}:{{ports[https][0]}}"
+  document.body.appendChild(site3Frame);
+  return ""
+}
+test().then((message) => {
+  if (message) {
+    window.top.postMessage(message, "*");
+  }
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers
new file mode 100644
index 00000000000..3e53702c6e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers
@@ -0,0 +1 @@
+Permissions-Policy: ch-device-memory=(*)
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html
new file mode 100644
index 00000000000..999e3b6c99f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 5 (client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status != 200) {
+    return "Site 3 fetching Site 1 didn't recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  return "ch-device-memory is available as expected for some"
+}
+test().then((message) => window.top.postMessage(message, "*"));
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers
new file mode 100644
index 00000000000..e8ccc92f511
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers
@@ -0,0 +1 @@
+Permissions-Policy: ch-device-memory=("https://{{host}}:{{ports[https][0]}}")
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html
new file mode 100644
index 00000000000..05d1db9fc99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 3 (client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html)
+  const policy = JSON.stringify(document.featurePolicy.getAllowlistForFeature("ch-device-memory"));
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 2 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  // Step 4 (client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html)
+  const site3Frame = document.createElement("iframe");
+  site3Frame.src = "https://{{domains[www2]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html";
+  site3Frame.allow = "ch-device-memory src"
+  document.body.appendChild(site3Frame);
+  return ""
+}
+test().then((message) => {
+  if (message) {
+    window.top.postMessage(message, "*");
+  }
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html
new file mode 100644
index 00000000000..497a19161f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<body>
+<script>
+async function test() {
+  // Step 5 (client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html)
+  let r = await fetch("https://{{host}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 1 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("https://{{hosts[alt][]}}:{{ports[https][0]}}/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 2 did recieve sec-ch-device-memory";
+  }
+  r = await fetch("/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py");
+  if (r.status == 200) {
+    return "Site 3 fetching Site 3 did recieve sec-ch-device-memory";
+  }
+  return "ch-device-memory is available as expected for src"
+}
+test().then((message) => window.top.postMessage(message, "*"));
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py
new file mode 100644
index 00000000000..f57e121252d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py
@@ -0,0 +1,11 @@
+def main(request, response):
+    """
+    Simple handler that sets the status based on whether sec-ch-device-memory was received.
+    """
+    response.headers.append(b"Access-Control-Allow-Origin", b"*")
+    response.headers.append(b"Access-Control-Allow-Headers", b"*")
+    response.headers.append(b"Access-Control-Expose-Headers", b"*")
+    if b"sec-ch-device-memory" in request.headers:
+        response.status = 200
+    else:
+        response.status = 400
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012.html b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012.html
index a6037ffbace..57519edf18f 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012.html
@@ -19,7 +19,7 @@
             --secondary-font: 'ahem-ex-250';
         }
         .adjusted {
-            font-size-adjust: 0.5;
+            font-size-adjust: 50%;
         }
         .test {
             font-family: var(--primary-font), var(--secondary-font);
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02-ref.html
index 44bf8a130be..85b213076ca 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02-ref.html
@@ -12,7 +12,7 @@
 div {
   font-size: 40px;
   line-height: 100px;
-  font-size-adjust: 0.5;
+  font-size-adjust: 50%;
 }
 
 .reference {
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02.html b/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02.html
index 3255b5ccaf0..e8491913105 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02.html
@@ -23,7 +23,7 @@
 div {
   font-size: 40px;
   line-height: 100px;
-  font-size-adjust: 0.5;
+  font-size-adjust: 50%;
 }
 
 .reference {
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar-notref.html
index e21bbd22fdb..76a216ca743 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar-notref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar-notref.html
@@ -8,7 +8,7 @@
   font-family: noto-naskh;
   src: url(/fonts/noto/NotoNaskhArabic-regular.woff2),
        url(/fonts/noto/NotoNaskhArabic-regular.ttf);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to Noto Naskh */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to Noto Naskh */
 }
 p {
   font-family: Ahem, noto-naskh, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar.html
index edc327add65..a65a564f9ba 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar.html
@@ -11,7 +11,7 @@
   font-family: noto-naskh;
   src: url(/fonts/noto/NotoNaskhArabic-regular.woff2),
        url(/fonts/noto/NotoNaskhArabic-regular.ttf);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to Noto Naskh */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to Noto Naskh */
 }
 p {
   font-family: Ahem, system-ui, noto-naskh, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-notref.html
index d3da976dcbb..c33e769ce33 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-notref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-notref.html
@@ -7,7 +7,7 @@
 @font-face {
   font-family: mplus;
   src: url(/fonts/mplus-1p-regular.woff);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to M+ */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to M+ */
 }
 p {
   font-family: Ahem, mplus, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-vs-zh.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-vs-zh.html
index 2fbd2b3e173..f3700697d5f 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-vs-zh.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-vs-zh.html
@@ -10,7 +10,7 @@
 @font-face {
   font-family: mplus;
   src: url(/fonts/mplus-1p-regular.woff);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to M+ */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to M+ */
 }
 p {
   font-family: Ahem, system-ui, mplus, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja.html
index ff249e486be..2b16fe005c6 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja.html
@@ -10,7 +10,7 @@
 @font-face {
   font-family: mplus;
   src: url(/fonts/mplus-1p-regular.woff);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to M+ */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to M+ */
 }
 p {
   font-family: Ahem, system-ui, mplus, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-notref.html
index bba395fc3e9..90529ea4ac1 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-notref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-notref.html
@@ -8,7 +8,7 @@
   font-family: noto-naskh;
   src: url(/fonts/noto/NotoNaskhArabic-regular.woff2),
        url(/fonts/noto/NotoNaskhArabic-regular.ttf);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to Noto Naskh */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to Noto Naskh */
 }
 p {
   font-family: Ahem, noto-naskh, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-vs-ar.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-vs-ar.html
index 451d2a03eaf..210534fd869 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-vs-ar.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-vs-ar.html
@@ -11,7 +11,7 @@
   font-family: noto-naskh;
   src: url(/fonts/noto/NotoNaskhArabic-regular.woff2),
        url(/fonts/noto/NotoNaskhArabic-regular.ttf);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to Noto Naskh */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to Noto Naskh */
 }
 p {
   font-family: Ahem, system-ui, noto-naskh, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur.html
index 9a8cccfcd82..bd26d29720b 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur.html
@@ -11,7 +11,7 @@
   font-family: noto-naskh;
   src: url(/fonts/noto/NotoNaskhArabic-regular.woff2),
        url(/fonts/noto/NotoNaskhArabic-regular.ttf);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to Noto Naskh */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to Noto Naskh */
 }
 p {
   font-family: Ahem, system-ui, noto-naskh, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh-notref.html
index 49a7204a340..ca072086c41 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh-notref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh-notref.html
@@ -7,7 +7,7 @@
 @font-face {
   font-family: mplus;
   src: url(/fonts/mplus-1p-regular.woff);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to M+ */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to M+ */
 }
 p {
   font-family: Ahem, mplus, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh.html b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh.html
index fbd52f2dec1..c99a3933161 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh.html
@@ -10,7 +10,7 @@
 @font-face {
   font-family: mplus;
   src: url(/fonts/mplus-1p-regular.woff);
-  size-adjust: 0.5; /* cause mismatch even if system-ui maps to M+ */
+  size-adjust: 50%; /* cause mismatch even if system-ui maps to M+ */
 }
 p {
   font-family: Ahem, system-ui, mplus, serif;
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering-2.html b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering-2.html
new file mode 100644
index 00000000000..2cb98bb9c2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering-2.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Image set no resolution rendering</title>
+<link rel="author" title="Noam Rosenthal" href="mailto:noam@webkit.org">
+<link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
+<link rel="match" href="reference/image-set-rendering-ref.html">
+<meta name="assert" content="image-set rendering with no resolution defined">
+<script src="resources/image-set-rendering-helper.js"></script>
+<style>
+  #test {
+    background-image: image-set(url("/images/green.png"), url("/images/green.png"));
+  }
+</style>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html
index 4877ba975fd..b9b335a287b 100644
--- a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html
+++ b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html
@@ -19,6 +19,47 @@ function test_invalid_value_variants(property, value) {
   test_invalid_value(property, "-webkit-" + value);
 }
 
+function test_default_resolution() {
+  // Based on the spec, the resolution is optional and should default
+  // to 1x if not specified.
+  // This set of tests verify this expectation.
+
+  // Test when the only image is missing it's resolution
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url(foo))',
+    'image-set(url("foo") 1x)'
+  );
+
+  // Test when the 1st of 2 images is missing it's resolution
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url(foo), url(bar) 1x)',
+    'image-set(url("foo") 1x, url("bar") 1x)'
+  );
+
+  // Test when the 2nd of 2 images is missing it's resolution
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url(foo) 1x, url(bar))',
+    'image-set(url("foo") 1x, url("bar") 1x)'
+  );
+
+  // Test when both images are missing their resolutions
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url(foo), url(bar))',
+    'image-set(url("foo") 1x, url("bar") 1x)'
+  );
+
+  // Test when the middle of 3 images is missing it's resolution
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url(foo) 1x, url(bar), url(baz) 2x)',
+    'image-set(url("foo") 1x, url("bar") 1x, url("baz") 2x)'
+  );
+}
+
 test_valid_value_variants('background-image', "image-set(url(example.png) 1x)", 'image-set(url("example.png") 1x)');
 test_valid_value_variants('background-image', 'image-set(url("example.png") 1x)');
 test_valid_value_variants('background-image', "image-set('example.jpg' 1x)", 'image-set(url("example.jpg") 1x)');
@@ -45,4 +86,6 @@ test_invalid_value_variants('background-image', "image-set(url(example.png) type
 test_invalid_value_variants('background-image', "image-set(url(example.png) 1xtype('image/png'))");
 test_invalid_value_variants('background-image', "image-set(type('image/png') url(example.png) 1x)");
 test_invalid_value_variants('cursor', "image-set(linear-gradient(black, white) 1x)");
+
+test_default_resolution();
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html
new file mode 100644
index 00000000000..a14b0bb09ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<angle>#",
+  inherits: false,
+  initialValue: "0deg"
+}, {
+  keyframes: ["100deg, 150deg", "200deg, 250deg"],
+  expected: "150deg, 200deg"
+}, 'Animating a custom property of type <angle>#');
+
+animation_test({
+  syntax: "<angle>#",
+  inherits: false,
+  initialValue: "100deg, 150deg"
+}, {
+  keyframes: "200deg, 250deg",
+  expected: "150deg, 200deg"
+}, 'Animating a custom property of type <angle># with a single keyframe');
+
+animation_test({
+  syntax: "<angle>#",
+  inherits: false,
+  initialValue: "50deg, 100deg"
+}, {
+  composite: "add",
+  keyframes: ["150deg, 200deg", "250deg, 300deg"],
+  expected: "250deg, 350deg"
+}, 'Animating a custom property of type <angle># with additivity');
+
+animation_test({
+  syntax: "<angle>#",
+  inherits: false,
+  initialValue: "50deg, 100deg"
+}, {
+  composite: "add",
+  keyframes: "150deg, 200deg",
+  expected: "125deg, 200deg"
+}, 'Animating a custom property of type <angle># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<angle>#",
+  inherits: false,
+  initialValue: "0deg, 0deg"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0deg, 50deg", "100deg, 100deg"],
+  expected: "250deg, 275deg"
+}, 'Animating a custom property of type <angle># with iterationComposite');
+
+discrete_animation_test("<angle>#", '10deg, 20deg', '30deg', 'Animating a custom property of type <angle># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html
new file mode 100644
index 00000000000..8ce7a9deabe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<angle>+",
+  inherits: false,
+  initialValue: "0deg"
+}, {
+  keyframes: ["100deg 150deg", "200deg 250deg"],
+  expected: "150deg 200deg"
+}, 'Animating a custom property of type <angle>+');
+
+animation_test({
+  syntax: "<angle>+",
+  inherits: false,
+  initialValue: "100deg 150deg"
+}, {
+  keyframes: "200deg 250deg",
+  expected: "150deg 200deg"
+}, 'Animating a custom property of type <angle>+ with a single keyframe');
+
+animation_test({
+  syntax: "<angle>+",
+  inherits: false,
+  initialValue: "50deg 100deg"
+}, {
+  composite: "add",
+  keyframes: ["150deg 200deg", "250deg 300deg"],
+  expected: "250deg 350deg"
+}, 'Animating a custom property of type <angle>+ with additivity');
+
+animation_test({
+  syntax: "<angle>+",
+  inherits: false,
+  initialValue: "50deg 100deg"
+}, {
+  composite: "add",
+  keyframes: "150deg 200deg",
+  expected: "125deg 200deg"
+}, 'Animating a custom property of type <angle>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<angle>+",
+  inherits: false,
+  initialValue: "0deg 0deg"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0deg 50deg", "100deg 100deg"],
+  expected: "250deg 275deg"
+}, 'Animating a custom property of type <angle>+ with iterationComposite');
+
+discrete_animation_test("<angle>+", '10deg 20deg', '30deg', 'Animating a custom property of type <angle>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html
new file mode 100644
index 00000000000..7148df07248
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<color>#",
+  inherits: false,
+  initialValue: "black"
+}, {
+  keyframes: ["rgb(100, 100, 100), rgb(150, 150, 150)", "rgb(200, 200, 200), rgb(250, 250, 250)"],
+  expected: "rgb(150, 150, 150), rgb(200, 200, 200)"
+}, 'Animating a custom property of type <color>#');
+
+animation_test({
+  syntax: "<color>#",
+  inherits: false,
+  initialValue: "rgb(100, 100, 100), rgb(150, 150, 150)"
+}, {
+  keyframes: "rgb(200, 200, 200), rgb(250, 250, 250)",
+  expected: "rgb(150, 150, 150), rgb(200, 200, 200)"
+}, 'Animating a custom property of type <color># with a single keyframe');
+
+animation_test({
+  syntax: "<color>#",
+  inherits: false,
+  initialValue: "rgb(100, 100, 100), rgb(150, 150, 150)"
+}, {
+  composite: "add",
+  keyframes: ["rgb(25, 25, 25), rgb(50, 50, 50)", "rgb(75, 75, 75), rgb(100, 100, 100)"],
+  expected: "rgb(150, 150, 150), rgb(225, 225, 225)"
+}, 'Animating a custom property of type <color># with additivity');
+
+animation_test({
+  syntax: "<color>#",
+  inherits: false,
+  initialValue: "rgb(100, 100, 100), rgb(150, 150, 150)"
+}, {
+  composite: "add",
+  keyframes: "rgb(50, 50, 50), rgb(100, 100, 100)",
+  expected: "rgb(125, 125, 125), rgb(200, 200, 200)"
+}, 'Animating a custom property of type <color># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<color>#",
+  inherits: false,
+  initialValue: "black"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["rgb(0, 0, 0), rgb(0, 0, 0)", "rgb(50, 50, 50), rgb(100, 100, 100)"],
+  expected: "rgb(125, 125, 125), rgb(250, 250, 250)"
+}, 'Animating a custom property of type <color># with iterationComposite');
+
+discrete_animation_test("<color>#", 'rgb(255, 0, 0), rgb(0, 255, 0)', 'rgb(0, 0, 255)', 'Animating a custom property of type <color># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html
new file mode 100644
index 00000000000..679e244667c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<color>+",
+  inherits: false,
+  initialValue: "black"
+}, {
+  keyframes: ["rgb(100, 100, 100) rgb(150, 150, 150)", "rgb(200, 200, 200) rgb(250, 250, 250)"],
+  expected: "rgb(150, 150, 150) rgb(200, 200, 200)"
+}, 'Animating a custom property of type <color>+');
+
+animation_test({
+  syntax: "<color>+",
+  inherits: false,
+  initialValue: "rgb(100, 100, 100) rgb(150, 150, 150)"
+}, {
+  keyframes: "rgb(200, 200, 200) rgb(250, 250, 250)",
+  expected: "rgb(150, 150, 150) rgb(200, 200, 200)"
+}, 'Animating a custom property of type <color>+ with a single keyframe');
+
+animation_test({
+  syntax: "<color>+",
+  inherits: false,
+  initialValue: "rgb(100, 100, 100) rgb(150, 150, 150)"
+}, {
+  composite: "add",
+  keyframes: ["rgb(25, 25, 25) rgb(50, 50, 50)", "rgb(75, 75, 75) rgb(100, 100, 100)"],
+  expected: "rgb(150, 150, 150) rgb(225, 225, 225)"
+}, 'Animating a custom property of type <color>+ with additivity');
+
+animation_test({
+  syntax: "<color>+",
+  inherits: false,
+  initialValue: "rgb(100, 100, 100) rgb(150, 150, 150)"
+}, {
+  composite: "add",
+  keyframes: "rgb(50, 50, 50) rgb(100, 100, 100)",
+  expected: "rgb(125, 125, 125) rgb(200, 200, 200)"
+}, 'Animating a custom property of type <color>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<color>+",
+  inherits: false,
+  initialValue: "black"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["rgb(0, 0, 0) rgb(0, 0, 0)", "rgb(50, 50, 50) rgb(100, 100, 100)"],
+  expected: "rgb(125, 125, 125) rgb(250, 250, 250)"
+}, 'Animating a custom property of type <color>+ with iterationComposite');
+
+discrete_animation_test("<color>+", 'rgb(255, 0, 0) rgb(0, 255, 0)', 'rgb(0, 0, 255)', 'Animating a custom property of type <color>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html
index 3f210f914b3..5bc2bed3436 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html
@@ -7,5 +7,7 @@
 <script>
 
 discrete_animation_test("<custom-ident>", "from", "to");
+discrete_animation_test("<custom-ident>+", "from1 from2", "to1 to2");
+discrete_animation_test("<custom-ident>#", "from1, from2", "to1, to2");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-image.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-image.html
index 935d3025d4a..4f9505f9a8e 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-image.html
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-image.html
@@ -7,5 +7,7 @@
 <script>
 
 discrete_animation_test("<image>", 'url("https://example.com/from")', 'url("https://example.com/to")');
+discrete_animation_test("<image>+", 'url("https://example.com/from1") url("https://example.com/from2")', 'url("https://example.com/to1") url("https://example.com/to2")');
+discrete_animation_test("<image>#", 'url("https://example.com/from1"), url("https://example.com/from2")', 'url("https://example.com/to1"), url("https://example.com/to2")');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html
new file mode 100644
index 00000000000..3f4beaedf1c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<integer>#",
+  inherits: false,
+  initialValue: "0"
+}, {
+  keyframes: ["100, 150", "200, 250"],
+  expected: "150, 200"
+}, 'Animating a custom property of type <integer>#');
+
+animation_test({
+  syntax: "<integer>#",
+  inherits: false,
+  initialValue: "100, 150"
+}, {
+  keyframes: "200, 250",
+  expected: "150, 200"
+}, 'Animating a custom property of type <integer># with a single keyframe');
+
+animation_test({
+  syntax: "<integer>#",
+  inherits: false,
+  initialValue: "50, 100"
+}, {
+  composite: "add",
+  keyframes: ["150, 200", "250, 300"],
+  expected: "250, 350"
+}, 'Animating a custom property of type <integer># with additivity');
+
+animation_test({
+  syntax: "<integer>#",
+  inherits: false,
+  initialValue: "50, 100"
+}, {
+  composite: "add",
+  keyframes: "150, 200",
+  expected: "125, 200"
+}, 'Animating a custom property of type <integer># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<integer>#",
+  inherits: false,
+  initialValue: "0, 0"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0, 50", "100, 100"],
+  expected: "250, 275"
+}, 'Animating a custom property of type <integer># with iterationComposite');
+
+discrete_animation_test("<integer>#", '10, 20', '30', 'Animating a custom property of type <integer># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html
new file mode 100644
index 00000000000..89feb3af150
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<integer>+",
+  inherits: false,
+  initialValue: "0"
+}, {
+  keyframes: ["100 150", "200 250"],
+  expected: "150 200"
+}, 'Animating a custom property of type <integer>+');
+
+animation_test({
+  syntax: "<integer>+",
+  inherits: false,
+  initialValue: "100 150"
+}, {
+  keyframes: "200 250",
+  expected: "150 200"
+}, 'Animating a custom property of type <integer>+ with a single keyframe');
+
+animation_test({
+  syntax: "<integer>+",
+  inherits: false,
+  initialValue: "50 100"
+}, {
+  composite: "add",
+  keyframes: ["150 200", "250 300"],
+  expected: "250 350"
+}, 'Animating a custom property of type <integer>+ with additivity');
+
+animation_test({
+  syntax: "<integer>+",
+  inherits: false,
+  initialValue: "50 100"
+}, {
+  composite: "add",
+  keyframes: "150 200",
+  expected: "125 200"
+}, 'Animating a custom property of type <integer>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<integer>+",
+  inherits: false,
+  initialValue: "0 0"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0 50", "100 100"],
+  expected: "250 275"
+}, 'Animating a custom property of type <integer>+ with iterationComposite');
+
+discrete_animation_test("<integer>+", '10 20', '30', 'Animating a custom property of type <integer>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html
new file mode 100644
index 00000000000..6f1fefb76fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<length>#",
+  inherits: false,
+  initialValue: "0px"
+}, {
+  keyframes: ["100px, 150px", "200px, 250px"],
+  expected: "150px, 200px"
+}, 'Animating a custom property of type <length>#');
+
+animation_test({
+  syntax: "<length>#",
+  inherits: false,
+  initialValue: "100px, 150px"
+}, {
+  keyframes: "200px, 250px",
+  expected: "150px, 200px"
+}, 'Animating a custom property of type <length># with a single keyframe');
+
+animation_test({
+  syntax: "<length>#",
+  inherits: false,
+  initialValue: "50px, 100px"
+}, {
+  composite: "add",
+  keyframes: ["150px, 200px", "250px, 300px"],
+  expected: "250px, 350px"
+}, 'Animating a custom property of type <length># with additivity');
+
+animation_test({
+  syntax: "<length>#",
+  inherits: false,
+  initialValue: "50px, 100px"
+}, {
+  composite: "add",
+  keyframes: "150px, 200px",
+  expected: "125px, 200px"
+}, 'Animating a custom property of type <length># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<length>#",
+  inherits: false,
+  initialValue: "0px, 0px"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0px, 50px", "100px, 100px"],
+  expected: "250px, 275px"
+}, 'Animating a custom property of type <length># with iterationComposite');
+
+discrete_animation_test("<length>#", '10px, 20px', '30px', 'Animating a custom property of type <length># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html
new file mode 100644
index 00000000000..bf3e75b7917
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<length-percentage>#",
+  inherits: false,
+  initialValue: "0px"
+}, {
+  keyframes: ["100px, 150%", "200%, 250px"],
+  expected: "calc(100% + 50px), calc(75% + 125px)"
+}, 'Animating a custom property of type <length-percentage>#');
+
+animation_test({
+  syntax: "<length-percentage>#",
+  inherits: false,
+  initialValue: "100px, 150%"
+}, {
+  keyframes: "200%, 250px",
+  expected: "calc(100% + 50px), calc(75% + 125px)"
+}, 'Animating a custom property of type <length-percentage># with a single keyframe');
+
+animation_test({
+  syntax: "<length-percentage>#",
+  inherits: false,
+  initialValue: "50px, 100%"
+}, {
+  composite: "add",
+  keyframes: ["150%, 200px", "250%, 300px"],
+  expected: "calc(200% + 50px), calc(100% + 250px)"
+}, 'Animating a custom property of type <length-percentage># with additivity');
+
+animation_test({
+  syntax: "<length-percentage>#",
+  inherits: false,
+  initialValue: "50px, 100%"
+}, {
+  composite: "add",
+  keyframes: "150%, 200px",
+  expected: "calc(75% + 50px), calc(100% + 100px)"
+}, 'Animating a custom property of type <length-percentage># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<length-percentage>#",
+  inherits: false,
+  initialValue: "0px, 0px"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0px, 50%", "100%, 100px"],
+  expected: "250%, calc(25% + 50px)"
+}, 'Animating a custom property of type <length-percentage># with iterationComposite');
+
+discrete_animation_test("<length-percentage>#", '10px, 20%', '30px', 'Animating a custom property of type <length-percentage># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html
new file mode 100644
index 00000000000..9497093b6ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<length-percentage>+",
+  inherits: false,
+  initialValue: "0px"
+}, {
+  keyframes: ["100px 150%", "200% 250px"],
+  expected: "calc(100% + 50px) calc(75% + 125px)"
+}, 'Animating a custom property of type <length-percentage>+');
+
+animation_test({
+  syntax: "<length-percentage>+",
+  inherits: false,
+  initialValue: "100px 150%"
+}, {
+  keyframes: "200% 250px",
+  expected: "calc(100% + 50px) calc(75% + 125px)"
+}, 'Animating a custom property of type <length-percentage>+ with a single keyframe');
+
+animation_test({
+  syntax: "<length-percentage>+",
+  inherits: false,
+  initialValue: "50px 100%"
+}, {
+  composite: "add",
+  keyframes: ["150% 200px", "250% 300px"],
+  expected: "calc(200% + 50px) calc(100% + 250px)"
+}, 'Animating a custom property of type <length-percentage>+ with additivity');
+
+animation_test({
+  syntax: "<length-percentage>+",
+  inherits: false,
+  initialValue: "50px 100%"
+}, {
+  composite: "add",
+  keyframes: "150% 200px",
+  expected: "calc(75% + 50px) calc(100% + 100px)"
+}, 'Animating a custom property of type <length-percentage>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<length-percentage>+",
+  inherits: false,
+  initialValue: "0px 0px"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0px 50%", "100% 100px"],
+  expected: "250% calc(25% + 50px)"
+}, 'Animating a custom property of type <length-percentage>+ with iterationComposite');
+
+discrete_animation_test("<length-percentage>+", '10px 20%', '30px', 'Animating a custom property of type <length-percentage>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html
new file mode 100644
index 00000000000..102259a070a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<length>+",
+  inherits: false,
+  initialValue: "0px"
+}, {
+  keyframes: ["100px 150px", "200px 250px"],
+  expected: "150px 200px"
+}, 'Animating a custom property of type <length>+');
+
+animation_test({
+  syntax: "<length>+",
+  inherits: false,
+  initialValue: "100px 150px"
+}, {
+  keyframes: "200px 250px",
+  expected: "150px 200px"
+}, 'Animating a custom property of type <length>+ with a single keyframe');
+
+animation_test({
+  syntax: "<length>+",
+  inherits: false,
+  initialValue: "50px 100px"
+}, {
+  composite: "add",
+  keyframes: ["150px 200px", "250px 300px"],
+  expected: "250px 350px"
+}, 'Animating a custom property of type <length>+ with additivity');
+
+animation_test({
+  syntax: "<length>+",
+  inherits: false,
+  initialValue: "50px 100px"
+}, {
+  composite: "add",
+  keyframes: "150px 200px",
+  expected: "125px 200px"
+}, 'Animating a custom property of type <length>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<length>+",
+  inherits: false,
+  initialValue: "0px 0px"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0px 50px", "100px 100px"],
+  expected: "250px 275px"
+}, 'Animating a custom property of type <length>+ with iterationComposite');
+
+discrete_animation_test("<length>+", '10px 20px', '30px', 'Animating a custom property of type <length>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html
new file mode 100644
index 00000000000..937b6caeeb3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<number>#",
+  inherits: false,
+  initialValue: "0"
+}, {
+  keyframes: ["100, 150", "200, 250"],
+  expected: "150, 200"
+}, 'Animating a custom property of type <number>#');
+
+animation_test({
+  syntax: "<number>#",
+  inherits: false,
+  initialValue: "100, 150"
+}, {
+  keyframes: "200, 250",
+  expected: "150, 200"
+}, 'Animating a custom property of type <number># with a single keyframe');
+
+animation_test({
+  syntax: "<number>#",
+  inherits: false,
+  initialValue: "50, 100"
+}, {
+  composite: "add",
+  keyframes: ["150, 200", "250, 300"],
+  expected: "250, 350"
+}, 'Animating a custom property of type <number># with additivity');
+
+animation_test({
+  syntax: "<number>#",
+  inherits: false,
+  initialValue: "50, 100"
+}, {
+  composite: "add",
+  keyframes: "150, 200",
+  expected: "125, 200"
+}, 'Animating a custom property of type <number># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<number>#",
+  inherits: false,
+  initialValue: "0, 0"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0, 50", "100, 100"],
+  expected: "250, 275"
+}, 'Animating a custom property of type <number># with iterationComposite');
+
+discrete_animation_test("<number>#", '10, 20', '30', 'Animating a custom property of type <number># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html
new file mode 100644
index 00000000000..61f177eb05d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<number>+",
+  inherits: false,
+  initialValue: "0"
+}, {
+  keyframes: ["100 150", "200 250"],
+  expected: "150 200"
+}, 'Animating a custom property of type <number>+');
+
+animation_test({
+  syntax: "<number>+",
+  inherits: false,
+  initialValue: "100 150"
+}, {
+  keyframes: "200 250",
+  expected: "150 200"
+}, 'Animating a custom property of type <number>+ with a single keyframe');
+
+animation_test({
+  syntax: "<number>+",
+  inherits: false,
+  initialValue: "50 100"
+}, {
+  composite: "add",
+  keyframes: ["150 200", "250 300"],
+  expected: "250 350"
+}, 'Animating a custom property of type <number>+ with additivity');
+
+animation_test({
+  syntax: "<number>+",
+  inherits: false,
+  initialValue: "50 100"
+}, {
+  composite: "add",
+  keyframes: "150 200",
+  expected: "125 200"
+}, 'Animating a custom property of type <number>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<number>+",
+  inherits: false,
+  initialValue: "0 0"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0 50", "100 100"],
+  expected: "250 275"
+}, 'Animating a custom property of type <number>+ with iterationComposite');
+
+discrete_animation_test("<number>+", '10 20', '30', 'Animating a custom property of type <number>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html
new file mode 100644
index 00000000000..c6900466461
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<percentage>#",
+  inherits: false,
+  initialValue: "0%"
+}, {
+  keyframes: ["100%, 150%", "200%, 250%"],
+  expected: "150%, 200%"
+}, 'Animating a custom property of type <percentage>#');
+
+animation_test({
+  syntax: "<percentage>#",
+  inherits: false,
+  initialValue: "100%, 150%"
+}, {
+  keyframes: "200%, 250%",
+  expected: "150%, 200%"
+}, 'Animating a custom property of type <percentage># with a single keyframe');
+
+animation_test({
+  syntax: "<percentage>#",
+  inherits: false,
+  initialValue: "50%, 100%"
+}, {
+  composite: "add",
+  keyframes: ["150%, 200%", "250%, 300%"],
+  expected: "250%, 350%"
+}, 'Animating a custom property of type <percentage># with additivity');
+
+animation_test({
+  syntax: "<percentage>#",
+  inherits: false,
+  initialValue: "50%, 100%"
+}, {
+  composite: "add",
+  keyframes: "150%, 200%",
+  expected: "125%, 200%"
+}, 'Animating a custom property of type <percentage># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<percentage>#",
+  inherits: false,
+  initialValue: "0%, 0%"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0%, 50%", "100%, 100%"],
+  expected: "250%, 275%"
+}, 'Animating a custom property of type <percentage># with iterationComposite');
+
+discrete_animation_test("<percentage>#", '10%, 20%', '30%', 'Animating a custom property of type <percentage># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html
new file mode 100644
index 00000000000..d012b851fdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<percentage>+",
+  inherits: false,
+  initialValue: "0%"
+}, {
+  keyframes: ["100% 150%", "200% 250%"],
+  expected: "150% 200%"
+}, 'Animating a custom property of type <percentage>+');
+
+animation_test({
+  syntax: "<percentage>+",
+  inherits: false,
+  initialValue: "100% 150%"
+}, {
+  keyframes: "200% 250%",
+  expected: "150% 200%"
+}, 'Animating a custom property of type <percentage>+ with a single keyframe');
+
+animation_test({
+  syntax: "<percentage>+",
+  inherits: false,
+  initialValue: "50% 100%"
+}, {
+  composite: "add",
+  keyframes: ["150% 200%", "250% 300%"],
+  expected: "250% 350%"
+}, 'Animating a custom property of type <percentage>+ with additivity');
+
+animation_test({
+  syntax: "<percentage>+",
+  inherits: false,
+  initialValue: "50% 100%"
+}, {
+  composite: "add",
+  keyframes: "150% 200%",
+  expected: "125% 200%"
+}, 'Animating a custom property of type <percentage>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<percentage>+",
+  inherits: false,
+  initialValue: "0% 0%"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0% 50%", "100% 100%"],
+  expected: "250% 275%"
+}, 'Animating a custom property of type <percentage>+ with iterationComposite');
+
+discrete_animation_test("<percentage>+", '10% 20%', '30%', 'Animating a custom property of type <percentage>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html
new file mode 100644
index 00000000000..22201947ff9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<resolution>#",
+  inherits: false,
+  initialValue: "0dppx"
+}, {
+  keyframes: ["100dppx, 150dppx", "200dppx, 250dppx"],
+  expected: "150dppx, 200dppx"
+}, 'Animating a custom property of type <resolution>#');
+
+animation_test({
+  syntax: "<resolution>#",
+  inherits: false,
+  initialValue: "100dppx, 150dppx"
+}, {
+  keyframes: "200dppx, 250dppx",
+  expected: "150dppx, 200dppx"
+}, 'Animating a custom property of type <resolution># with a single keyframe');
+
+animation_test({
+  syntax: "<resolution>#",
+  inherits: false,
+  initialValue: "50dppx, 100dppx"
+}, {
+  composite: "add",
+  keyframes: ["150dppx, 200dppx", "250dppx, 300dppx"],
+  expected: "250dppx, 350dppx"
+}, 'Animating a custom property of type <resolution># with additivity');
+
+animation_test({
+  syntax: "<resolution>#",
+  inherits: false,
+  initialValue: "50dppx, 100dppx"
+}, {
+  composite: "add",
+  keyframes: "150dppx, 200dppx",
+  expected: "125dppx, 200dppx"
+}, 'Animating a custom property of type <resolution># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<resolution>#",
+  inherits: false,
+  initialValue: "0dppx, 0dppx"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0dppx, 50dppx", "100dppx, 100dppx"],
+  expected: "250dppx, 275dppx"
+}, 'Animating a custom property of type <resolution># with iterationComposite');
+
+discrete_animation_test("<resolution>#", '10dppx, 20dppx', '30dppx', 'Animating a custom property of type <resolution># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html
new file mode 100644
index 00000000000..d4765d4e32b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<resolution>+",
+  inherits: false,
+  initialValue: "0dppx"
+}, {
+  keyframes: ["100dppx 150dppx", "200dppx 250dppx"],
+  expected: "150dppx 200dppx"
+}, 'Animating a custom property of type <resolution>+');
+
+animation_test({
+  syntax: "<resolution>+",
+  inherits: false,
+  initialValue: "100dppx 150dppx"
+}, {
+  keyframes: "200dppx 250dppx",
+  expected: "150dppx 200dppx"
+}, 'Animating a custom property of type <resolution>+ with a single keyframe');
+
+animation_test({
+  syntax: "<resolution>+",
+  inherits: false,
+  initialValue: "50dppx 100dppx"
+}, {
+  composite: "add",
+  keyframes: ["150dppx 200dppx", "250dppx 300dppx"],
+  expected: "250dppx 350dppx"
+}, 'Animating a custom property of type <resolution>+ with additivity');
+
+animation_test({
+  syntax: "<resolution>+",
+  inherits: false,
+  initialValue: "50dppx 100dppx"
+}, {
+  composite: "add",
+  keyframes: "150dppx 200dppx",
+  expected: "125dppx 200dppx"
+}, 'Animating a custom property of type <resolution>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<resolution>+",
+  inherits: false,
+  initialValue: "0dppx 0dppx"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0dppx 50dppx", "100dppx 100dppx"],
+  expected: "250dppx 275dppx"
+}, 'Animating a custom property of type <resolution>+ with iterationComposite');
+
+discrete_animation_test("<resolution>+", '10dppx 20dppx', '30dppx', 'Animating a custom property of type <resolution>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html
new file mode 100644
index 00000000000..bf07baf1308
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<time>#",
+  inherits: false,
+  initialValue: "0s"
+}, {
+  keyframes: ["100s, 150s", "200s, 250s"],
+  expected: "150s, 200s"
+}, 'Animating a custom property of type <time>#');
+
+animation_test({
+  syntax: "<time>#",
+  inherits: false,
+  initialValue: "100s, 150s"
+}, {
+  keyframes: "200s, 250s",
+  expected: "150s, 200s"
+}, 'Animating a custom property of type <time># with a single keyframe');
+
+animation_test({
+  syntax: "<time>#",
+  inherits: false,
+  initialValue: "50s, 100s"
+}, {
+  composite: "add",
+  keyframes: ["150s, 200s", "250s, 300s"],
+  expected: "250s, 350s"
+}, 'Animating a custom property of type <time># with additivity');
+
+animation_test({
+  syntax: "<time>#",
+  inherits: false,
+  initialValue: "50s, 100s"
+}, {
+  composite: "add",
+  keyframes: "150s, 200s",
+  expected: "125s, 200s"
+}, 'Animating a custom property of type <time># with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<time>#",
+  inherits: false,
+  initialValue: "0s, 0s"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0s, 50s", "100s, 100s"],
+  expected: "250s, 275s"
+}, 'Animating a custom property of type <time># with iterationComposite');
+
+discrete_animation_test("<time>#", '10s, 20s', '30s', 'Animating a custom property of type <time># with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html
new file mode 100644
index 00000000000..c0fe206ea7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<time>+",
+  inherits: false,
+  initialValue: "0s"
+}, {
+  keyframes: ["100s 150s", "200s 250s"],
+  expected: "150s 200s"
+}, 'Animating a custom property of type <time>+');
+
+animation_test({
+  syntax: "<time>+",
+  inherits: false,
+  initialValue: "100s 150s"
+}, {
+  keyframes: "200s 250s",
+  expected: "150s 200s"
+}, 'Animating a custom property of type <time>+ with a single keyframe');
+
+animation_test({
+  syntax: "<time>+",
+  inherits: false,
+  initialValue: "50s 100s"
+}, {
+  composite: "add",
+  keyframes: ["150s 200s", "250s 300s"],
+  expected: "250s 350s"
+}, 'Animating a custom property of type <time>+ with additivity');
+
+animation_test({
+  syntax: "<time>+",
+  inherits: false,
+  initialValue: "50s 100s"
+}, {
+  composite: "add",
+  keyframes: "150s 200s",
+  expected: "125s 200s"
+}, 'Animating a custom property of type <time>+ with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<time>+",
+  inherits: false,
+  initialValue: "0s 0s"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["0s 50s", "100s 100s"],
+  expected: "250s 275s"
+}, 'Animating a custom property of type <time>+ with iterationComposite');
+
+discrete_animation_test("<time>+", '10s 20s', '30s', 'Animating a custom property of type <time>+ with different lengths is discrete');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html
new file mode 100644
index 00000000000..9ffaec830f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(0px)"
+}, {
+  keyframes: ["translateX(100px) scale(2)", "translateX(200px) scale(4)"],
+  expected: "translateX(150px) scale(3)"
+}, 'Animating a custom property of type <transform-list> containing multiple values');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px) scale(2)"
+}, {
+  keyframes: "translateX(200px) scale(4)",
+  expected: "translateX(150px) scale(3)"
+}, 'Animating a custom property of type <transform-list> containing multiple values with a single keyframe');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px) scale(2)"
+}, {
+  composite: "add",
+  keyframes: ["translateX(200px) scale(3)", "translateX(300px) scale(4)"],
+  expected: "translateX(100px) scale(2) translateX(250px) scale(3.5)"
+}, 'Animating a custom property of type <transform-list> containing multiple values with additivity');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px) scale(2)"
+}, {
+  composite: "add",
+  keyframes: "translateX(300px) scale(3)",
+  expected: "translateX(100px) scale(2) translateX(150px) scale(2)"
+}, 'Animating a custom property of type <transform-list> containing multiple values with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px) scale(2)"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["translateX(0px) scale(3)", "translateX(100px) scale(4)"],
+  expected: "translateX(250px) scale(11.5)"
+}, 'Animating a custom property of type <transform-list> containing multiple values with iterationComposite');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(0px)"
+}, {
+  keyframes: ["translateX(100px) scale(2)", "rotate(180deg)"],
+  expected: "matrix(0, -1.5, 1.5, 0, 50, 0)"
+}, 'Animating a custom property of type <transform-list> containing multiple values and with mismatching list lengths');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html
new file mode 100644
index 00000000000..b9bce6dd0b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/utils.js"></script>
+<div id="target"></div>
+<script>
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(0px)"
+}, {
+  keyframes: ["translateX(100px)", "translateX(200px)"],
+  expected: "translateX(150px)"
+}, 'Animating a custom property of type <transform-list> containing a single value');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px)"
+}, {
+  keyframes: "translateX(200px)",
+  expected: "translateX(150px)"
+}, 'Animating a custom property of type <transform-list> containing a single value with a single keyframe');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px)"
+}, {
+  composite: "add",
+  keyframes: ["translateX(200px)", "translateX(300px)"],
+  expected: "translateX(100px) translateX(250px)"
+}, 'Animating a custom property of type <transform-list> containing a single value with additivity');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px)"
+}, {
+  composite: "add",
+  keyframes: "translateX(300px)",
+  expected: "translateX(100px) translateX(150px)"
+}, 'Animating a custom property of type <transform-list> containing a single value with a single keyframe and additivity');
+
+animation_test({
+  syntax: "<transform-list>",
+  inherits: false,
+  initialValue: "translateX(100px)"
+}, {
+  iterationComposite: "accumulate",
+  keyframes: ["translateX(0px)", "translateX(100px)"],
+  expected: "translateX(250px)"
+}, 'Animating a custom property of type <transform-list> containing a single value with iterationComposite');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-url.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-url.html
index 00ea48557fe..830b9e1f496 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-url.html
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-url.html
@@ -7,5 +7,7 @@
 <script>
 
 discrete_animation_test("<url>", 'url("https://example.com/from")', 'url("https://example.com/to")');
+discrete_animation_test("<url>+", 'url("https://example.com/from1") url("https://example.com/from2")', 'url("https://example.com/to1") url("https://example.com/to2")');
+discrete_animation_test("<url>#", 'url("https://example.com/from1"), url("https://example.com/from2")', 'url("https://example.com/to1"), url("https://example.com/to2")');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/resources/utils.js b/tests/wpt/web-platform-tests/css/css-properties-values-api/resources/utils.js
index c9a0c73828f..005723e7015 100644
--- a/tests/wpt/web-platform-tests/css/css-properties-values-api/resources/utils.js
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/resources/utils.js
@@ -148,7 +148,7 @@ function animation_test(property, values, description) {
   }, description);
 };
 
-function discrete_animation_test(syntax, fromValue, toValue) {
+function discrete_animation_test(syntax, fromValue, toValue, description) {
   test(() => {
     const name = generate_name();
 
@@ -176,5 +176,5 @@ function discrete_animation_test(syntax, fromValue, toValue) {
     checkAtProgress(0.5, toValue);
     checkAtProgress(0.75, toValue);
     checkAtProgress(1, toValue);
-  }, `Animating a custom property of type ${syntax} is discrete`);
+  }, description || `Animating a custom property of type ${syntax} is discrete`);
 }