diff --git a/tests/wpt/metadata-layout-2020/cookies/name/name-ctl.html.ini b/tests/wpt/metadata-layout-2020/cookies/name/name-ctl.html.ini
index c4fb18bba36..b0f6753bf59 100644
--- a/tests/wpt/metadata-layout-2020/cookies/name/name-ctl.html.ini
+++ b/tests/wpt/metadata-layout-2020/cookies/name/name-ctl.html.ini
@@ -1,370 +1,371 @@
 [name-ctl.html]
+  expected: ERROR
   [Cookie with %x0 in name is truncated.]
     expected: FAIL
 
   [Cookie with %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/cookies/value/value-ctl.html.ini b/tests/wpt/metadata-layout-2020/cookies/value/value-ctl.html.ini
index a827ccff99a..ffb4f2a0949 100644
--- a/tests/wpt/metadata-layout-2020/cookies/value/value-ctl.html.ini
+++ b/tests/wpt/metadata-layout-2020/cookies/value/value-ctl.html.ini
@@ -1,370 +1,371 @@
 [value-ctl.html]
+  expected: ERROR
   [Cookie with %x0 in value is truncated.]
     expected: FAIL
 
   [Cookie with %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index 4ccf7dd1301..278c5650801 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
@@ -203,3 +203,126 @@
   [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
+
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 d2e6dc61a95..00d67ac8b7d 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
@@ -479,3 +479,303 @@
   [left percentage(%) / events]
     expected: FAIL
 
+  [margin-right length(cm) / events]
+    expected: FAIL
+
+  [margin-right length(in) / events]
+    expected: FAIL
+
+  [margin-top length(pt) / events]
+    expected: FAIL
+
+  [margin-top length(pc) / events]
+    expected: FAIL
+
+  [margin-top length(px) / events]
+    expected: FAIL
+
+  [margin-top length(em) / events]
+    expected: FAIL
+
+  [margin-top length(ex) / events]
+    expected: FAIL
+
+  [margin-top length(mm) / events]
+    expected: FAIL
+
+  [margin-top length(cm) / events]
+    expected: FAIL
+
+  [margin-top length(in) / events]
+    expected: FAIL
+
+  [height length(pt) / events]
+    expected: FAIL
+
+  [height length(pc) / events]
+    expected: FAIL
+
+  [height length(px) / events]
+    expected: FAIL
+
+  [height length(em) / events]
+    expected: FAIL
+
+  [height length(ex) / events]
+    expected: FAIL
+
+  [height length(mm) / events]
+    expected: FAIL
+
+  [height length(cm) / events]
+    expected: FAIL
+
+  [height length(in) / events]
+    expected: FAIL
+
+  [height percentage(%) / events]
+    expected: FAIL
+
+  [width length(pt) / events]
+    expected: FAIL
+
+  [width length(pc) / events]
+    expected: FAIL
+
+  [width length(px) / events]
+    expected: FAIL
+
+  [width length(em) / events]
+    expected: FAIL
+
+  [width length(ex) / events]
+    expected: FAIL
+
+  [width length(mm) / events]
+    expected: FAIL
+
+  [width length(cm) / events]
+    expected: FAIL
+
+  [width length(in) / events]
+    expected: FAIL
+
+  [width percentage(%) / events]
+    expected: FAIL
+
+  [min-height length(pt) / events]
+    expected: FAIL
+
+  [min-height length(pc) / events]
+    expected: FAIL
+
+  [min-height length(px) / events]
+    expected: FAIL
+
+  [min-height length(em) / events]
+    expected: FAIL
+
+  [min-height length(ex) / events]
+    expected: FAIL
+
+  [min-height length(mm) / events]
+    expected: FAIL
+
+  [min-height length(cm) / events]
+    expected: FAIL
+
+  [min-height length(in) / events]
+    expected: FAIL
+
+  [min-height percentage(%) / events]
+    expected: FAIL
+
+  [min-width length(pt) / events]
+    expected: FAIL
+
+  [min-width length(pc) / events]
+    expected: FAIL
+
+  [min-width length(px) / events]
+    expected: FAIL
+
+  [min-width length(em) / events]
+    expected: FAIL
+
+  [min-width length(ex) / events]
+    expected: FAIL
+
+  [min-width length(mm) / events]
+    expected: FAIL
+
+  [min-width length(cm) / events]
+    expected: FAIL
+
+  [min-width length(in) / events]
+    expected: FAIL
+
+  [min-width percentage(%) / events]
+    expected: FAIL
+
+  [max-height length(pt) / events]
+    expected: FAIL
+
+  [max-height length(pc) / events]
+    expected: FAIL
+
+  [max-height length(px) / events]
+    expected: FAIL
+
+  [max-height length(em) / events]
+    expected: FAIL
+
+  [color color(rgba) / events]
+    expected: FAIL
+
+  [font-size length(pt) / events]
+    expected: FAIL
+
+  [font-size length(pc) / events]
+    expected: FAIL
+
+  [font-size length(px) / events]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
+  [font-size length(ex) / events]
+    expected: FAIL
+
+  [font-size length(mm) / events]
+    expected: FAIL
+
+  [font-size length(cm) / events]
+    expected: FAIL
+
+  [font-size length(in) / events]
+    expected: FAIL
+
+  [font-size percentage(%) / events]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / events]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / events]
+    expected: FAIL
+
+  [line-height number(integer) / events]
+    expected: FAIL
+
+  [line-height number(decimal) / events]
+    expected: FAIL
+
+  [line-height length(pt) / events]
+    expected: FAIL
+
+  [line-height length(pc) / events]
+    expected: FAIL
+
+  [line-height length(px) / events]
+    expected: FAIL
+
+  [line-height length(em) / events]
+    expected: FAIL
+
+  [line-height length(ex) / events]
+    expected: FAIL
+
+  [line-height length(mm) / events]
+    expected: FAIL
+
+  [line-height length(cm) / events]
+    expected: FAIL
+
+  [line-height length(in) / events]
+    expected: FAIL
+
+  [line-height percentage(%) / events]
+    expected: FAIL
+
+  [letter-spacing length(pt) / events]
+    expected: FAIL
+
+  [letter-spacing length(pc) / events]
+    expected: FAIL
+
+  [letter-spacing length(px) / events]
+    expected: FAIL
+
+  [letter-spacing length(em) / events]
+    expected: FAIL
+
+  [letter-spacing length(ex) / events]
+    expected: FAIL
+
+  [letter-spacing length(mm) / events]
+    expected: FAIL
+
+  [letter-spacing length(cm) / events]
+    expected: FAIL
+
+  [letter-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing length(pt) / events]
+    expected: FAIL
+
+  [word-spacing length(pc) / events]
+    expected: FAIL
+
+  [word-spacing length(px) / events]
+    expected: FAIL
+
+  [word-spacing length(em) / events]
+    expected: FAIL
+
+  [word-spacing length(ex) / events]
+    expected: FAIL
+
+  [word-spacing length(mm) / events]
+    expected: FAIL
+
+  [word-spacing length(cm) / events]
+    expected: FAIL
+
+  [word-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing percentage(%) / events]
+    expected: FAIL
+
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
index 492f1b2bd2e..02b619a775c 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
@@ -326,3 +326,453 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
+  [margin-right length(cm) / values]
+    expected: FAIL
+
+  [margin-right length(in) / values]
+    expected: FAIL
+
+  [margin-top length(pt) / values]
+    expected: FAIL
+
+  [margin-top length(pc) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [margin-top length(em) / values]
+    expected: FAIL
+
+  [margin-top length(ex) / values]
+    expected: FAIL
+
+  [margin-top length(mm) / values]
+    expected: FAIL
+
+  [margin-top length(cm) / values]
+    expected: FAIL
+
+  [margin-top length(in) / values]
+    expected: FAIL
+
+  [height length(pt) / values]
+    expected: FAIL
+
+  [height length(pc) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [height length(em) / values]
+    expected: FAIL
+
+  [height length(ex) / values]
+    expected: FAIL
+
+  [height length(mm) / values]
+    expected: FAIL
+
+  [height length(cm) / values]
+    expected: FAIL
+
+  [height length(in) / values]
+    expected: FAIL
+
+  [height percentage(%) / values]
+    expected: FAIL
+
+  [width length(pt) / values]
+    expected: FAIL
+
+  [width length(pc) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
+
+  [width length(em) / values]
+    expected: FAIL
+
+  [width length(ex) / values]
+    expected: FAIL
+
+  [width length(mm) / values]
+    expected: FAIL
+
+  [width length(cm) / values]
+    expected: FAIL
+
+  [width length(in) / values]
+    expected: FAIL
+
+  [width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [max-height length(ex) / values]
+    expected: FAIL
+
+  [max-height length(mm) / values]
+    expected: FAIL
+
+  [max-height length(cm) / values]
+    expected: FAIL
+
+  [max-height length(in) / values]
+    expected: FAIL
+
+  [max-height percentage(%) / values]
+    expected: FAIL
+
+  [max-width length(pt) / values]
+    expected: FAIL
+
+  [max-width length(pc) / values]
+    expected: FAIL
+
+  [max-width length(px) / values]
+    expected: FAIL
+
+  [max-width length(em) / values]
+    expected: FAIL
+
+  [max-width length(ex) / values]
+    expected: FAIL
+
+  [max-width length(mm) / values]
+    expected: FAIL
+
+  [max-width length(cm) / values]
+    expected: FAIL
+
+  [max-width length(in) / values]
+    expected: FAIL
+
+  [max-width percentage(%) / values]
+    expected: FAIL
+
+  [top length(pt) / values]
+    expected: FAIL
+
+  [top length(pc) / values]
+    expected: FAIL
+
+  [top length(px) / values]
+    expected: FAIL
+
+  [top length(em) / values]
+    expected: FAIL
+
+  [top length(ex) / values]
+    expected: FAIL
+
+  [top length(mm) / values]
+    expected: FAIL
+
+  [top length(cm) / values]
+    expected: FAIL
+
+  [top length(in) / values]
+    expected: FAIL
+
+  [top percentage(%) / values]
+    expected: FAIL
+
+  [right length(pt) / values]
+    expected: FAIL
+
+  [right length(pc) / values]
+    expected: FAIL
+
+  [right length(px) / values]
+    expected: FAIL
+
+  [right length(em) / values]
+    expected: FAIL
+
+  [right length(ex) / values]
+    expected: FAIL
+
+  [right length(mm) / values]
+    expected: FAIL
+
+  [right length(cm) / values]
+    expected: FAIL
+
+  [right length(in) / values]
+    expected: FAIL
+
+  [right percentage(%) / values]
+    expected: FAIL
+
+  [bottom length(pt) / values]
+    expected: FAIL
+
+  [bottom length(pc) / values]
+    expected: FAIL
+
+  [bottom length(px) / values]
+    expected: FAIL
+
+  [bottom length(em) / values]
+    expected: FAIL
+
+  [bottom length(ex) / values]
+    expected: FAIL
+
+  [bottom length(mm) / values]
+    expected: FAIL
+
+  [bottom length(cm) / values]
+    expected: FAIL
+
+  [bottom length(in) / values]
+    expected: FAIL
+
+  [bottom percentage(%) / values]
+    expected: FAIL
+
+  [left length(pt) / values]
+    expected: FAIL
+
+  [left length(pc) / values]
+    expected: FAIL
+
+  [left length(px) / values]
+    expected: FAIL
+
+  [left length(em) / values]
+    expected: FAIL
+
+  [left length(ex) / values]
+    expected: FAIL
+
+  [left length(mm) / values]
+    expected: FAIL
+
+  [left length(cm) / values]
+    expected: FAIL
+
+  [left length(in) / values]
+    expected: FAIL
+
+  [left percentage(%) / values]
+    expected: FAIL
+
+  [color color(rgba) / values]
+    expected: FAIL
+
+  [font-size length(pt) / values]
+    expected: FAIL
+
+  [font-size length(pc) / values]
+    expected: FAIL
+
+  [font-size length(px) / values]
+    expected: FAIL
+
+  [font-size length(em) / values]
+    expected: FAIL
+
+  [font-size length(ex) / values]
+    expected: FAIL
+
+  [font-size length(mm) / values]
+    expected: FAIL
+
+  [font-size length(cm) / values]
+    expected: FAIL
+
+  [font-size length(in) / values]
+    expected: FAIL
+
+  [font-size percentage(%) / values]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / values]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / values]
+    expected: FAIL
+
+  [line-height number(integer) / values]
+    expected: FAIL
+
+  [line-height number(decimal) / values]
+    expected: FAIL
+
+  [line-height length(pt) / values]
+    expected: FAIL
+
+  [line-height length(pc) / values]
+    expected: FAIL
+
+  [line-height length(px) / values]
+    expected: FAIL
+
+  [line-height length(em) / values]
+    expected: FAIL
+
+  [line-height length(ex) / values]
+    expected: FAIL
+
+  [line-height length(mm) / values]
+    expected: FAIL
+
+  [line-height length(cm) / values]
+    expected: FAIL
+
+  [line-height length(in) / values]
+    expected: FAIL
+
+  [line-height percentage(%) / values]
+    expected: FAIL
+
+  [letter-spacing length(pt) / values]
+    expected: FAIL
+
+  [letter-spacing length(pc) / values]
+    expected: FAIL
+
+  [letter-spacing length(px) / values]
+    expected: FAIL
+
+  [letter-spacing length(em) / values]
+    expected: FAIL
+
+  [letter-spacing length(ex) / values]
+    expected: FAIL
+
+  [letter-spacing length(mm) / values]
+    expected: FAIL
+
+  [letter-spacing length(cm) / values]
+    expected: FAIL
+
+  [letter-spacing length(in) / values]
+    expected: FAIL
+
+  [word-spacing length(pt) / values]
+    expected: FAIL
+
+  [word-spacing length(pc) / values]
+    expected: FAIL
+
+  [word-spacing length(px) / values]
+    expected: FAIL
+
+  [word-spacing length(em) / values]
+    expected: FAIL
+
+  [word-spacing length(ex) / values]
+    expected: FAIL
+
+  [word-spacing length(mm) / values]
+    expected: FAIL
+
+  [word-spacing length(cm) / values]
+    expected: FAIL
+
+  [word-spacing length(in) / values]
+    expected: FAIL
+
+  [word-spacing percentage(%) / values]
+    expected: FAIL
+
+  [text-indent length(pt) / values]
+    expected: FAIL
+
+  [text-indent length(pc) / values]
+    expected: FAIL
+
+  [text-indent length(px) / values]
+    expected: FAIL
+
+  [text-indent length(em) / values]
+    expected: FAIL
+
+  [text-indent length(ex) / values]
+    expected: FAIL
+
+  [text-indent length(mm) / values]
+    expected: FAIL
+
+  [text-indent length(cm) / values]
+    expected: FAIL
+
+  [text-indent length(in) / values]
+    expected: FAIL
+
+  [text-indent percentage(%) / values]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 049ea102a9a..35c0730f5a1 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -14,3 +14,9 @@
   [test some point of the element: bottom right corner]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
+  [test the top of layer]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/scrollIntoView-inline-image.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/scrollIntoView-inline-image.html.ini
new file mode 100644
index 00000000000..ce77c90fdad
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/scrollIntoView-inline-image.html.ini
@@ -0,0 +1,4 @@
+[scrollIntoView-inline-image.html]
+  [Scrolling an inline element with a large line height uses the bounding rect]
+    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 f84e8a5b024..bbd92b1e257 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
@@ -309,21 +309,12 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 279734168dc..5afce5ed90a 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -59,3 +59,9 @@
   [separate text/javascript;charset=windows-1252  text/javascript]
     expected: FAIL
 
+  [separate text/javascript; charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 51f8272a6de..dc2e45516de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[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/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index 16fa2c5cfc1..dec4c579137 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,4 +1,5 @@
 [creating_browsing_context_test_01.html]
+  expected: TIMEOUT
   [first argument: absolute url]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 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,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 7241374d721..a5ce20f7b87 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,12 +2,6 @@
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
@@ -26,51 +20,60 @@
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
   [input type url: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart a second time (must not fire select)]
+  [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/resource-timing/entry-attributes.html.ini b/tests/wpt/metadata-layout-2020/resource-timing/entry-attributes.html.ini
index d6511d343e3..ec3c03ee0d9 100644
--- a/tests/wpt/metadata-layout-2020/resource-timing/entry-attributes.html.ini
+++ b/tests/wpt/metadata-layout-2020/resource-timing/entry-attributes.html.ini
@@ -2,3 +2,9 @@
   [URL fragments should be present in the 'name' attribute]
     expected: FAIL
 
+  [Image resources should generate conformant entries]
+    expected: FAIL
+
+  [Font resources should generate conformant entries]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index c6c63131da6..44e18266831 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -662,3 +662,15 @@
   [X SNR (40.857243958094884 dB) is not greater than or equal to 65.737. Got 40.857243958094884.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[15240\]\t2.8386753421030787e+36\t3.3531737327575684e-1\t2.8386753421030787e+36\t8.4656375372731475e+36\t9.0957000000000003e-5\n\t[15241\]\t4.5870103931208562e-41\t3.9367997646331787e-1\t3.9367997646331787e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 2.8386753421030787e+36 at index of 15240.\n\tMax RelError of 8.4656375372731475e+36 at index of 15240.\n]
+    expected: FAIL
+
+  [X SNR (-685.6282285623681 dB) is not greater than or equal to 85.58. Got -685.6282285623681.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[7189\]\t2.9238665330408166e+36\t-9.8956179618835449e-1\t2.9238665330408166e+36\t2.9547083813291069e+36\t3.8985999999999999e-3\n\t[7190\]\t-8.8409073650836945e-2\t-9.9664616584777832e-1\t9.0823709219694138e-1\t9.1129341918891205e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.9238665330408166e+36 at index of 7189.\n\tMax RelError of 2.9547083813291069e+36 at index of 7189.\n]
+    expected: FAIL
+
+  [X SNR (-685.8850649422825 dB) is not greater than or equal to 65.737. Got -685.8850649422825.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
index 9d262275083..d7071b6bcee 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,3 +2,6 @@
   [test_element_in_object]
     expected: FAIL
 
+  [test_element_in_collection]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini
index b470ea8a75e..9ecdd175b18 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/find.py.ini
@@ -1,4 +1,5 @@
 [find.py]
+  expected: ERROR
   [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bfd4d6dd2d6..bf2a1d61bab 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,5 +1,4 @@
 [import-in-moduleworker.html]
-  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 8813d8076bf..96e92b1c66e 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -605,6 +605,13 @@
         {}
        ]
       ],
+      "negative_caption_margin.html": [
+       "cd3c4f4bf7a83ea59ae4b97aaab94bfe3df2fb7b",
+       [
+        null,
+        {}
+       ]
+      ],
       "orthogonal-cell-crash.html": [
        "0f27d3eccd17bca09996048f7dbfbb143fbf03be",
        [
@@ -24056,6 +24063,19 @@
        ],
        {}
       ]
+     ],
+     "overflowing-block-print.html": [
+      "daa9e24f33a49546f852fe387814ec9aa8b56e90",
+      [
+       null,
+       [
+        [
+         "/css/css-break/overflowing-block-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "css-flexbox": {
@@ -24156,27 +24176,6 @@
        {}
       ]
      ]
-    },
-    "vendor-imports": {
-     "mozilla": {
-      "mozilla-central-reftests": {
-       "break3": {
-        "moz-block-fragmentation-001-print.html": [
-         "61b72e2ab96bfd112748673a2ceea00de324b3e8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/break3/moz-block-fragmentation-001-print-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       }
-      }
-     }
     }
    },
    "custom-elements": {
@@ -285896,6 +285895,14 @@
        "2642b0fa06730692aa4617260b6903b7f698b4b4",
        []
       ],
+      "navigate-self-to-javascript.html": [
+       "86ea60c2837908f4f9f852cbef134102b5d2e03a",
+       []
+      ],
+      "postmessage-opener.html": [
+       "3282711dbc2c9bac534e44fa9d11ef3870a8c563",
+       []
+      ],
       "postmessage-top.html": [
        "4f83a58dd4a80b5a6171266d2944e628d204e434",
        []
@@ -286926,7 +286933,7 @@
       []
      ],
      "cookie-test.js": [
-      "1a13408ae82833457f51a56fa6b562b68a8c2eb4",
+      "9a965060ea97e4fefb544188712f15785d14752f",
       []
      ],
      "cookie.py": [
@@ -307315,6 +307322,10 @@
       "8321333458316b7b1fe9df40a29abb81e585a1f0",
       []
      ],
+     "overflowing-block-print-ref.html": [
+      "cf345b59638f28ddf423ed343a269178ab47f1b9",
+      []
+     ],
      "reference": {
       "widows-001-ref.html": [
        "4f822f8fd67aed18355177a5e9de18d8a63f895e",
@@ -337429,12 +337440,6 @@
         "7b0be875a7d7ed9eebaf8be92db40da8139ec698",
         []
        ],
-       "break3": {
-        "moz-block-fragmentation-001-print-ref.html": [
-         "cf345b59638f28ddf423ed343a269178ab47f1b9",
-         []
-        ]
-       },
        "counter-styles-3": {
         "dependent-builtin-ref.html": [
          "a558ce29e6c2b0a2fd13238e9887b0e9bd169938",
@@ -357142,10 +357147,6 @@
      "6c07b434bf235e933586e4600232b9baede6579f",
      []
     ],
-    "appmanifest.idl": [
-     "e3117265450c2920212607575c8c1ba27c36596d",
-     []
-    ],
     "audio-output.idl": [
      "80ceb225308a057d99ce39f575ebcf8eb40ab5fb",
      []
@@ -357198,10 +357199,6 @@
      "993b327fe70aa3e369e0bd7c7ea6dcdb227c60cc",
      []
     ],
-    "cors-rfc1918.idl": [
-     "b470f3f5a153f37ecf3607ee85e6ea2c511a237c",
-     []
-    ],
     "credential-management.idl": [
      "a2b062a7ffd864c32e43f161a40fdcfb058e9bda",
      []
@@ -357570,6 +357567,10 @@
      "4f1e4bee835a23c5b7bcf54b5b05f4ded2b08023",
      []
     ],
+    "private-network-access.idl": [
+     "b470f3f5a153f37ecf3607ee85e6ea2c511a237c",
+     []
+    ],
     "proximity.idl": [
      "3cbfbd5ad139031a62d730e9a460b797b7537789",
      []
@@ -358056,7 +358057,7 @@
     ]
    },
    "lint.ignore": [
-    "5d8db43125e75236420bcb0ce97ee73f6a0033ff",
+    "0b95e5a9f50adaf4f91a510919ed27d7fb48b319",
     []
    ],
    "loading": {
@@ -407054,6 +407055,13 @@
        {}
       ]
      ],
+     "javascript-url-open-in-main-window.html": [
+      "2366284fc5970d51a9a9b0f0bf00d7e4c0f14267",
+      [
+       null,
+       {}
+      ]
+     ],
      "javascript-url-srcdoc-cross-origin-iframe-inheritance.html": [
       "81210fe30f41faf10a2ca9704c9295bbd228ecfd",
       [
@@ -407089,6 +407097,13 @@
        {}
       ]
      ],
+     "window-open-local-after-network-scheme.sub.html": [
+      "dfae9a3020bc442a007d39d96605da10eb291dbc",
+      [
+       null,
+       {}
+      ]
+     ],
      "window.html": [
       "73def60cebe8df3a8c56ef5caa6a7899362e09f3",
       [
@@ -408577,6 +408592,13 @@
        {}
       ]
      ],
+     "img-src-redirect.sub.html": [
+      "9bffad09b36c52f4884d2034a4dee79f6d67167b",
+      [
+       null,
+       {}
+      ]
+     ],
      "inside-dedicated-worker.html": [
       "0912ec2ad92658dc38a3fe2761f6e85fbeb883f1",
       [
@@ -410577,7 +410599,7 @@
     ],
     "name": {
      "name-ctl.html": [
-      "26e6b8b910c657a4ec921e652e6aaba3eeb675a0",
+      "c966c3b4eee7dc6ef619e05a54d0bd8307ba3e6b",
       [
        null,
        {
@@ -411012,7 +411034,7 @@
     },
     "value": {
      "value-ctl.html": [
-      "e76a95f3f1d783cd6539a6bebdc2a79358bf7700",
+      "71c10c214159a72294152ef9d9d7ec4f841347aa",
       [
        null,
        {
@@ -423702,6 +423724,13 @@
      }
     },
     "css-properties-values-api": {
+     "animate-invalid.html": [
+      "41cbd067b52935c7dfedb9f8f2821a9a57baad82",
+      [
+       null,
+       {}
+      ]
+     ],
      "at-property-animation.html": [
       "89ed671fdf1d838ee4a5c7f87e02b6bf1c6e4470",
       [
@@ -427206,7 +427235,7 @@
        ]
       ],
       "table-width-redistribution-fixed.html": [
-       "ed126710601c1a034e6664a40212f1ebdaf3b9a5",
+       "4f7cf8ecb37e0658e9359a63529c0879a6b31a3e",
        [
         null,
         {}
@@ -427403,13 +427432,6 @@
       ]
      ],
      "width-distribution": {
-      "colspan_redistribution.tentative.html": [
-       "d5f7451456a893faa927fc1f3251202d4fded8a9",
-       [
-        null,
-        {}
-       ]
-      ],
       "computing-column-measure-0.html": [
        "795ad7e65ca537012313cc8df0cab126bd63a3f1",
        [
@@ -436618,6 +436640,13 @@
        {}
       ]
      ],
+     "scrollIntoView-inline-image.html": [
+      "1bdc75a27a78823e4084d4f97a567813c96ac70f",
+      [
+       null,
+       {}
+      ]
+     ],
      "scrollIntoView-scrollMargin.html": [
       "930702aa8792506df50120feaca86d3f76bc1a02",
       [
@@ -437722,7 +437751,7 @@
       ]
      ],
      "focus-visible-006.html": [
-      "c203c06f6eaaf5f388237f3f1b792c3708c8a089",
+      "f607df250a5a528f83e31e616317f027b4360a15",
       [
        null,
        {
@@ -466704,7 +466733,7 @@
     },
     "private-network-access": {
      "idlharness.tentative.any.js": [
-      "070de34c72a7f3beaa807c6b374dfd775ac7d2e0",
+      "5a7726f4fdc02dfe29807783c45fbd347681552a",
       [
        "fetch/private-network-access/idlharness.tentative.any.html",
        {
@@ -536632,7 +536661,7 @@
      ]
     ],
     "entry-attributes.html": [
-     "1aee1a3958b4fd111ba9695559217dab4093a1cf",
+     "013f4d7989c0f22758e113e8a457d175bec869d7",
      [
       null,
       {}
diff --git a/tests/wpt/metadata/cookies/name/name-ctl.html.ini b/tests/wpt/metadata/cookies/name/name-ctl.html.ini
index c4fb18bba36..b0f6753bf59 100644
--- a/tests/wpt/metadata/cookies/name/name-ctl.html.ini
+++ b/tests/wpt/metadata/cookies/name/name-ctl.html.ini
@@ -1,370 +1,371 @@
 [name-ctl.html]
+  expected: ERROR
   [Cookie with %x0 in name is truncated.]
     expected: FAIL
 
   [Cookie with %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f in name is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %x0 in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xa in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xd in name is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/cookies/value/value-ctl.html.ini b/tests/wpt/metadata/cookies/value/value-ctl.html.ini
index a827ccff99a..ffb4f2a0949 100644
--- a/tests/wpt/metadata/cookies/value/value-ctl.html.ini
+++ b/tests/wpt/metadata/cookies/value/value-ctl.html.ini
@@ -1,370 +1,371 @@
 [value-ctl.html]
+  expected: ERROR
   [Cookie with %x0 in value is truncated.]
     expected: FAIL
 
   [Cookie with %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f in value is rejected.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %x0 in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xa in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x2 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x3 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x4 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x5 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x6 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x8 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x9 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xb after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xc after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xe after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %xf after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x10 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x11 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x12 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x13 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x14 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x15 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x16 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x17 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x18 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x19 after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1a after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1b after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1c after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1d after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1e after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x1f after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Cookie with %x7f after %xd in value is truncated.]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index 4ccf7dd1301..278c5650801 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
@@ -203,3 +203,126 @@
   [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
+
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 d2e6dc61a95..00d67ac8b7d 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
@@ -479,3 +479,303 @@
   [left percentage(%) / events]
     expected: FAIL
 
+  [margin-right length(cm) / events]
+    expected: FAIL
+
+  [margin-right length(in) / events]
+    expected: FAIL
+
+  [margin-top length(pt) / events]
+    expected: FAIL
+
+  [margin-top length(pc) / events]
+    expected: FAIL
+
+  [margin-top length(px) / events]
+    expected: FAIL
+
+  [margin-top length(em) / events]
+    expected: FAIL
+
+  [margin-top length(ex) / events]
+    expected: FAIL
+
+  [margin-top length(mm) / events]
+    expected: FAIL
+
+  [margin-top length(cm) / events]
+    expected: FAIL
+
+  [margin-top length(in) / events]
+    expected: FAIL
+
+  [height length(pt) / events]
+    expected: FAIL
+
+  [height length(pc) / events]
+    expected: FAIL
+
+  [height length(px) / events]
+    expected: FAIL
+
+  [height length(em) / events]
+    expected: FAIL
+
+  [height length(ex) / events]
+    expected: FAIL
+
+  [height length(mm) / events]
+    expected: FAIL
+
+  [height length(cm) / events]
+    expected: FAIL
+
+  [height length(in) / events]
+    expected: FAIL
+
+  [height percentage(%) / events]
+    expected: FAIL
+
+  [width length(pt) / events]
+    expected: FAIL
+
+  [width length(pc) / events]
+    expected: FAIL
+
+  [width length(px) / events]
+    expected: FAIL
+
+  [width length(em) / events]
+    expected: FAIL
+
+  [width length(ex) / events]
+    expected: FAIL
+
+  [width length(mm) / events]
+    expected: FAIL
+
+  [width length(cm) / events]
+    expected: FAIL
+
+  [width length(in) / events]
+    expected: FAIL
+
+  [width percentage(%) / events]
+    expected: FAIL
+
+  [min-height length(pt) / events]
+    expected: FAIL
+
+  [min-height length(pc) / events]
+    expected: FAIL
+
+  [min-height length(px) / events]
+    expected: FAIL
+
+  [min-height length(em) / events]
+    expected: FAIL
+
+  [min-height length(ex) / events]
+    expected: FAIL
+
+  [min-height length(mm) / events]
+    expected: FAIL
+
+  [min-height length(cm) / events]
+    expected: FAIL
+
+  [min-height length(in) / events]
+    expected: FAIL
+
+  [min-height percentage(%) / events]
+    expected: FAIL
+
+  [min-width length(pt) / events]
+    expected: FAIL
+
+  [min-width length(pc) / events]
+    expected: FAIL
+
+  [min-width length(px) / events]
+    expected: FAIL
+
+  [min-width length(em) / events]
+    expected: FAIL
+
+  [min-width length(ex) / events]
+    expected: FAIL
+
+  [min-width length(mm) / events]
+    expected: FAIL
+
+  [min-width length(cm) / events]
+    expected: FAIL
+
+  [min-width length(in) / events]
+    expected: FAIL
+
+  [min-width percentage(%) / events]
+    expected: FAIL
+
+  [max-height length(pt) / events]
+    expected: FAIL
+
+  [max-height length(pc) / events]
+    expected: FAIL
+
+  [max-height length(px) / events]
+    expected: FAIL
+
+  [max-height length(em) / events]
+    expected: FAIL
+
+  [color color(rgba) / events]
+    expected: FAIL
+
+  [font-size length(pt) / events]
+    expected: FAIL
+
+  [font-size length(pc) / events]
+    expected: FAIL
+
+  [font-size length(px) / events]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
+  [font-size length(ex) / events]
+    expected: FAIL
+
+  [font-size length(mm) / events]
+    expected: FAIL
+
+  [font-size length(cm) / events]
+    expected: FAIL
+
+  [font-size length(in) / events]
+    expected: FAIL
+
+  [font-size percentage(%) / events]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / events]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / events]
+    expected: FAIL
+
+  [line-height number(integer) / events]
+    expected: FAIL
+
+  [line-height number(decimal) / events]
+    expected: FAIL
+
+  [line-height length(pt) / events]
+    expected: FAIL
+
+  [line-height length(pc) / events]
+    expected: FAIL
+
+  [line-height length(px) / events]
+    expected: FAIL
+
+  [line-height length(em) / events]
+    expected: FAIL
+
+  [line-height length(ex) / events]
+    expected: FAIL
+
+  [line-height length(mm) / events]
+    expected: FAIL
+
+  [line-height length(cm) / events]
+    expected: FAIL
+
+  [line-height length(in) / events]
+    expected: FAIL
+
+  [line-height percentage(%) / events]
+    expected: FAIL
+
+  [letter-spacing length(pt) / events]
+    expected: FAIL
+
+  [letter-spacing length(pc) / events]
+    expected: FAIL
+
+  [letter-spacing length(px) / events]
+    expected: FAIL
+
+  [letter-spacing length(em) / events]
+    expected: FAIL
+
+  [letter-spacing length(ex) / events]
+    expected: FAIL
+
+  [letter-spacing length(mm) / events]
+    expected: FAIL
+
+  [letter-spacing length(cm) / events]
+    expected: FAIL
+
+  [letter-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing length(pt) / events]
+    expected: FAIL
+
+  [word-spacing length(pc) / events]
+    expected: FAIL
+
+  [word-spacing length(px) / events]
+    expected: FAIL
+
+  [word-spacing length(em) / events]
+    expected: FAIL
+
+  [word-spacing length(ex) / events]
+    expected: FAIL
+
+  [word-spacing length(mm) / events]
+    expected: FAIL
+
+  [word-spacing length(cm) / events]
+    expected: FAIL
+
+  [word-spacing length(in) / events]
+    expected: FAIL
+
+  [word-spacing percentage(%) / events]
+    expected: FAIL
+
+  [text-indent length(pt) / events]
+    expected: FAIL
+
+  [text-indent length(pc) / events]
+    expected: FAIL
+
+  [text-indent length(px) / events]
+    expected: FAIL
+
+  [text-indent length(em) / events]
+    expected: FAIL
+
+  [text-indent length(ex) / events]
+    expected: FAIL
+
+  [text-indent length(mm) / events]
+    expected: FAIL
+
+  [text-indent length(cm) / events]
+    expected: FAIL
+
+  [text-indent length(in) / events]
+    expected: FAIL
+
+  [text-indent percentage(%) / events]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / events]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index 492f1b2bd2e..02b619a775c 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
@@ -326,3 +326,453 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
+  [margin-right length(cm) / values]
+    expected: FAIL
+
+  [margin-right length(in) / values]
+    expected: FAIL
+
+  [margin-top length(pt) / values]
+    expected: FAIL
+
+  [margin-top length(pc) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [margin-top length(em) / values]
+    expected: FAIL
+
+  [margin-top length(ex) / values]
+    expected: FAIL
+
+  [margin-top length(mm) / values]
+    expected: FAIL
+
+  [margin-top length(cm) / values]
+    expected: FAIL
+
+  [margin-top length(in) / values]
+    expected: FAIL
+
+  [height length(pt) / values]
+    expected: FAIL
+
+  [height length(pc) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [height length(em) / values]
+    expected: FAIL
+
+  [height length(ex) / values]
+    expected: FAIL
+
+  [height length(mm) / values]
+    expected: FAIL
+
+  [height length(cm) / values]
+    expected: FAIL
+
+  [height length(in) / values]
+    expected: FAIL
+
+  [height percentage(%) / values]
+    expected: FAIL
+
+  [width length(pt) / values]
+    expected: FAIL
+
+  [width length(pc) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
+
+  [width length(em) / values]
+    expected: FAIL
+
+  [width length(ex) / values]
+    expected: FAIL
+
+  [width length(mm) / values]
+    expected: FAIL
+
+  [width length(cm) / values]
+    expected: FAIL
+
+  [width length(in) / values]
+    expected: FAIL
+
+  [width percentage(%) / values]
+    expected: FAIL
+
+  [min-height length(pt) / values]
+    expected: FAIL
+
+  [min-height length(pc) / values]
+    expected: FAIL
+
+  [min-height length(px) / values]
+    expected: FAIL
+
+  [min-height length(em) / values]
+    expected: FAIL
+
+  [min-height length(ex) / values]
+    expected: FAIL
+
+  [min-height length(mm) / values]
+    expected: FAIL
+
+  [min-height length(cm) / values]
+    expected: FAIL
+
+  [min-height length(in) / values]
+    expected: FAIL
+
+  [min-height percentage(%) / values]
+    expected: FAIL
+
+  [min-width length(pt) / values]
+    expected: FAIL
+
+  [min-width length(pc) / values]
+    expected: FAIL
+
+  [min-width length(px) / values]
+    expected: FAIL
+
+  [min-width length(em) / values]
+    expected: FAIL
+
+  [min-width length(ex) / values]
+    expected: FAIL
+
+  [min-width length(mm) / values]
+    expected: FAIL
+
+  [min-width length(cm) / values]
+    expected: FAIL
+
+  [min-width length(in) / values]
+    expected: FAIL
+
+  [min-width percentage(%) / values]
+    expected: FAIL
+
+  [max-height length(pt) / values]
+    expected: FAIL
+
+  [max-height length(pc) / values]
+    expected: FAIL
+
+  [max-height length(px) / values]
+    expected: FAIL
+
+  [max-height length(em) / values]
+    expected: FAIL
+
+  [max-height length(ex) / values]
+    expected: FAIL
+
+  [max-height length(mm) / values]
+    expected: FAIL
+
+  [max-height length(cm) / values]
+    expected: FAIL
+
+  [max-height length(in) / values]
+    expected: FAIL
+
+  [max-height percentage(%) / values]
+    expected: FAIL
+
+  [max-width length(pt) / values]
+    expected: FAIL
+
+  [max-width length(pc) / values]
+    expected: FAIL
+
+  [max-width length(px) / values]
+    expected: FAIL
+
+  [max-width length(em) / values]
+    expected: FAIL
+
+  [max-width length(ex) / values]
+    expected: FAIL
+
+  [max-width length(mm) / values]
+    expected: FAIL
+
+  [max-width length(cm) / values]
+    expected: FAIL
+
+  [max-width length(in) / values]
+    expected: FAIL
+
+  [max-width percentage(%) / values]
+    expected: FAIL
+
+  [top length(pt) / values]
+    expected: FAIL
+
+  [top length(pc) / values]
+    expected: FAIL
+
+  [top length(px) / values]
+    expected: FAIL
+
+  [top length(em) / values]
+    expected: FAIL
+
+  [top length(ex) / values]
+    expected: FAIL
+
+  [top length(mm) / values]
+    expected: FAIL
+
+  [top length(cm) / values]
+    expected: FAIL
+
+  [top length(in) / values]
+    expected: FAIL
+
+  [top percentage(%) / values]
+    expected: FAIL
+
+  [right length(pt) / values]
+    expected: FAIL
+
+  [right length(pc) / values]
+    expected: FAIL
+
+  [right length(px) / values]
+    expected: FAIL
+
+  [right length(em) / values]
+    expected: FAIL
+
+  [right length(ex) / values]
+    expected: FAIL
+
+  [right length(mm) / values]
+    expected: FAIL
+
+  [right length(cm) / values]
+    expected: FAIL
+
+  [right length(in) / values]
+    expected: FAIL
+
+  [right percentage(%) / values]
+    expected: FAIL
+
+  [bottom length(pt) / values]
+    expected: FAIL
+
+  [bottom length(pc) / values]
+    expected: FAIL
+
+  [bottom length(px) / values]
+    expected: FAIL
+
+  [bottom length(em) / values]
+    expected: FAIL
+
+  [bottom length(ex) / values]
+    expected: FAIL
+
+  [bottom length(mm) / values]
+    expected: FAIL
+
+  [bottom length(cm) / values]
+    expected: FAIL
+
+  [bottom length(in) / values]
+    expected: FAIL
+
+  [bottom percentage(%) / values]
+    expected: FAIL
+
+  [left length(pt) / values]
+    expected: FAIL
+
+  [left length(pc) / values]
+    expected: FAIL
+
+  [left length(px) / values]
+    expected: FAIL
+
+  [left length(em) / values]
+    expected: FAIL
+
+  [left length(ex) / values]
+    expected: FAIL
+
+  [left length(mm) / values]
+    expected: FAIL
+
+  [left length(cm) / values]
+    expected: FAIL
+
+  [left length(in) / values]
+    expected: FAIL
+
+  [left percentage(%) / values]
+    expected: FAIL
+
+  [color color(rgba) / values]
+    expected: FAIL
+
+  [font-size length(pt) / values]
+    expected: FAIL
+
+  [font-size length(pc) / values]
+    expected: FAIL
+
+  [font-size length(px) / values]
+    expected: FAIL
+
+  [font-size length(em) / values]
+    expected: FAIL
+
+  [font-size length(ex) / values]
+    expected: FAIL
+
+  [font-size length(mm) / values]
+    expected: FAIL
+
+  [font-size length(cm) / values]
+    expected: FAIL
+
+  [font-size length(in) / values]
+    expected: FAIL
+
+  [font-size percentage(%) / values]
+    expected: FAIL
+
+  [font-weight font-weight(keyword) / values]
+    expected: FAIL
+
+  [font-weight font-weight(numeric) / values]
+    expected: FAIL
+
+  [line-height number(integer) / values]
+    expected: FAIL
+
+  [line-height number(decimal) / values]
+    expected: FAIL
+
+  [line-height length(pt) / values]
+    expected: FAIL
+
+  [line-height length(pc) / values]
+    expected: FAIL
+
+  [line-height length(px) / values]
+    expected: FAIL
+
+  [line-height length(em) / values]
+    expected: FAIL
+
+  [line-height length(ex) / values]
+    expected: FAIL
+
+  [line-height length(mm) / values]
+    expected: FAIL
+
+  [line-height length(cm) / values]
+    expected: FAIL
+
+  [line-height length(in) / values]
+    expected: FAIL
+
+  [line-height percentage(%) / values]
+    expected: FAIL
+
+  [letter-spacing length(pt) / values]
+    expected: FAIL
+
+  [letter-spacing length(pc) / values]
+    expected: FAIL
+
+  [letter-spacing length(px) / values]
+    expected: FAIL
+
+  [letter-spacing length(em) / values]
+    expected: FAIL
+
+  [letter-spacing length(ex) / values]
+    expected: FAIL
+
+  [letter-spacing length(mm) / values]
+    expected: FAIL
+
+  [letter-spacing length(cm) / values]
+    expected: FAIL
+
+  [letter-spacing length(in) / values]
+    expected: FAIL
+
+  [word-spacing length(pt) / values]
+    expected: FAIL
+
+  [word-spacing length(pc) / values]
+    expected: FAIL
+
+  [word-spacing length(px) / values]
+    expected: FAIL
+
+  [word-spacing length(em) / values]
+    expected: FAIL
+
+  [word-spacing length(ex) / values]
+    expected: FAIL
+
+  [word-spacing length(mm) / values]
+    expected: FAIL
+
+  [word-spacing length(cm) / values]
+    expected: FAIL
+
+  [word-spacing length(in) / values]
+    expected: FAIL
+
+  [word-spacing percentage(%) / values]
+    expected: FAIL
+
+  [text-indent length(pt) / values]
+    expected: FAIL
+
+  [text-indent length(pc) / values]
+    expected: FAIL
+
+  [text-indent length(px) / values]
+    expected: FAIL
+
+  [text-indent length(em) / values]
+    expected: FAIL
+
+  [text-indent length(ex) / values]
+    expected: FAIL
+
+  [text-indent length(mm) / values]
+    expected: FAIL
+
+  [text-indent length(cm) / values]
+    expected: FAIL
+
+  [text-indent length(in) / values]
+    expected: FAIL
+
+  [text-indent percentage(%) / values]
+    expected: FAIL
+
+  [text-shadow shadow(shadow) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 7a72369bb16..60d2eb026f3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -18,3 +18,9 @@
   [test some point of the element: bottom right corner]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
+  [test the top of layer]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/scrollIntoView-inline-image.html.ini b/tests/wpt/metadata/css/cssom-view/scrollIntoView-inline-image.html.ini
new file mode 100644
index 00000000000..ce77c90fdad
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/scrollIntoView-inline-image.html.ini
@@ -0,0 +1,4 @@
+[scrollIntoView-inline-image.html]
+  [Scrolling an inline element with a large line height uses the bounding rect]
+    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 934626d7802..cc42eb9599e 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,21 +309,12 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 279734168dc..5afce5ed90a 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -59,3 +59,9 @@
   [separate text/javascript;charset=windows-1252  text/javascript]
     expected: FAIL
 
+  [separate text/javascript; charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 51f8272a6de..dc2e45516de 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[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/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index 16fa2c5cfc1..dec4c579137 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,4 +1,5 @@
 [creating_browsing_context_test_01.html]
+  expected: TIMEOUT
   [first argument: absolute url]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 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,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 7241374d721..a5ce20f7b87 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,12 +2,6 @@
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
@@ -26,51 +20,60 @@
   [textarea: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
   [input type url: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart a second time (must not fire select)]
+  [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setSelectionRange out of range a second time (must not fire select)]
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/resource-timing/entry-attributes.html.ini b/tests/wpt/metadata/resource-timing/entry-attributes.html.ini
index d6511d343e3..ec3c03ee0d9 100644
--- a/tests/wpt/metadata/resource-timing/entry-attributes.html.ini
+++ b/tests/wpt/metadata/resource-timing/entry-attributes.html.ini
@@ -2,3 +2,9 @@
   [URL fragments should be present in the 'name' attribute]
     expected: FAIL
 
+  [Image resources should generate conformant entries]
+    expected: FAIL
+
+  [Font resources should generate conformant entries]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 38d47c9e9f1..dd55449cef3 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -890,3 +890,15 @@
   [X SNR (40.857243958094884 dB) is not greater than or equal to 65.737. Got 40.857243958094884.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[15240\]\t2.8386753421030787e+36\t3.3531737327575684e-1\t2.8386753421030787e+36\t8.4656375372731475e+36\t9.0957000000000003e-5\n\t[15241\]\t4.5870103931208562e-41\t3.9367997646331787e-1\t3.9367997646331787e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 2.8386753421030787e+36 at index of 15240.\n\tMax RelError of 8.4656375372731475e+36 at index of 15240.\n]
+    expected: FAIL
+
+  [X SNR (-685.6282285623681 dB) is not greater than or equal to 85.58. Got -685.6282285623681.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[7189\]\t2.9238665330408166e+36\t-9.8956179618835449e-1\t2.9238665330408166e+36\t2.9547083813291069e+36\t3.8985999999999999e-3\n\t[7190\]\t-8.8409073650836945e-2\t-9.9664616584777832e-1\t9.0823709219694138e-1\t9.1129341918891205e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.9238665330408166e+36 at index of 7189.\n\tMax RelError of 2.9547083813291069e+36 at index of 7189.\n]
+    expected: FAIL
+
+  [X SNR (-685.8850649422825 dB) is not greater than or equal to 65.737. Got -685.8850649422825.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
index 9d262275083..d7071b6bcee 100644
--- a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,3 +2,6 @@
   [test_element_in_object]
     expected: FAIL
 
+  [test_element_in_collection]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini
index b470ea8a75e..9ecdd175b18 100644
--- a/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/find.py.ini
@@ -1,4 +1,5 @@
 [find.py]
+  expected: ERROR
   [test_find_elements_link_text[<a href=#>link text</a>-link text\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bfd4d6dd2d6..bf2a1d61bab 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,5 +1,4 @@
 [import-in-moduleworker.html]
-  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html
new file mode 100644
index 00000000000..2366284fc59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html
@@ -0,0 +1,13 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  async_test(t => {
+    window.addEventListener("message", t.step_func_done(e => {
+      assert_equals(e.data, "img blocked",
+                    "Img should be blocked by CSP img-src 'none'");
+    }));
+
+    w = window.open("./support/navigate-self-to-javascript.html");
+    t.add_cleanup(w.close);
+  }, "Executing Javascript URL keeps enforcing previous CSPs of the document.");
+</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html
new file mode 100644
index 00000000000..86ea60c2837
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html
@@ -0,0 +1,12 @@
+<meta http-equiv="Content-Security-Policy" content="img-src 'none'"/>
+<script>
+  const js_payload = `
+    <div>
+      <img src="${window.origin}/content-security-policy/support/fail.png"
+           onload="opener.postMessage(\\\'img loaded\\\', \\\'*\\\');"
+           onerror="opener.postMessage(\\\'img blocked\\\', \\\'*\\\');"
+      >
+    </div>
+  `;
+  open(`javascript:'${js_payload}'`,"_self");
+</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-opener.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-opener.html
new file mode 100644
index 00000000000..3282711dbc2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-opener.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<script>
+  opener.postMessage("ready", "*");
+</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html b/tests/wpt/web-platform-tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html
new file mode 100644
index 00000000000..dfae9a3020b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<meta http-equiv="Content-Security-Policy" content="img-src 'none'">
+<title>about:blank in popup inherits CSPs from the navigation initiator</title>
+<body>
+
+<script>
+  const message_from = (w) => {
+    return new Promise(resolve => {
+      window.addEventListener('message', msg => {
+        if (msg.source == w)
+          resolve(msg.data);
+      });
+    });
+  };
+
+  const testCases = [
+    {
+      previous_origin: window.origin,
+      name: "Popup being navigated to about:blank was same-origin.",
+    },
+    {
+      previous_origin: "http://{{hosts[alt][]}}:{{ports[http][0]}}",
+      name: "Popup being navigated to about:blank was cross-origin.",
+    },
+  ];
+
+  testCases.forEach(testCase => {
+    promise_test(async t => {
+      // Create a popup and navigate it.
+      const popup = window.open("about:blank", testCase.name);
+      const loaded = message_from(popup);
+      window.open(testCase.previous_origin + "/content-security-policy/inheritance/support/postmessage-opener.html", testCase.name);
+      t.add_cleanup(() => popup.close());
+
+      assert_equals(await loaded, "ready");
+
+      // Navigate the popup to "about:blank".
+      window.open("about:blank", testCase.name);
+      await t.step_wait(
+        condition = () => {
+          try {
+            return popup.location.href == "about:blank";
+          } catch {}
+          return false;
+        },
+        description = "Wait for the popup to navigate.",
+        timeout=3000,
+        interval=50);
+
+      // Now create an img in the popup and check if it is blocked by CSPs.
+      const script = popup.document.createElement('script');
+      script.innerText = `
+        function messageBack(msg) {
+          opener.postMessage(msg ,"*");
+        }
+      `;
+      popup.document.head.appendChild(script);
+      const div = popup.document.createElement('div');
+
+      const img_url = window.origin + "/content-security-policy/support/fail.png";
+      div.innerHTML = `
+        <img src="${img_url}"
+             onload="messageBack('img loaded');"
+             onerror="messageBack('img blocked');"
+        >
+      `;
+
+      const msg = message_from(popup);
+      popup.document.body.appendChild(div);
+      assert_equals(await msg, "img blocked");
+    }, testCase.name);
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html b/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html
new file mode 100644
index 00000000000..9bffad09b36
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta http-equiv="content-security-policy" content="img-src 'self'">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body></body>
+<script>
+  async_test(t => {
+    const i = document.createElement("img");
+
+    const target = "http://{{hosts[alt][]}}:{{ports[http][0]}}/content-security-policy/support/fail.png";
+    const url = window.origin + "/common/redirect.py?location=" + encodeURIComponent(target);
+
+    window.addEventListener('securitypolicyviolation', t.step_func_done((e) => {
+      assert_equals(e.blockedURI, url);
+    }));
+
+    i.onload = t.step_func(() => {
+      assert_unreached("Img should be blocked.");
+    });
+    i.src = url;
+
+    document.body.appendChild(i);
+  }, "The blocked URI in the security policy violation event should be the original URI before redirects.");
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/cookies/name/name-ctl.html b/tests/wpt/web-platform-tests/cookies/name/name-ctl.html
index 26e6b8b910c..c966c3b4eee 100644
--- a/tests/wpt/web-platform-tests/cookies/name/name-ctl.html
+++ b/tests/wpt/web-platform-tests/cookies/name/name-ctl.html
@@ -16,6 +16,9 @@
       // CTLs are defined by RFC 5234 to be %x00-1F / %x7F.
       const {TERMINATING_CTLS, CTLS} = getCtlCharacters();
 
+      // Start with a clean slate.
+      dropAllDomCookies();
+
       // Test that terminating CTLs truncate the cookie string.
       for (const ctl of TERMINATING_CTLS) {
         domCookieTest(
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js b/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
index 1a13408ae82..9a965060ea9 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js
@@ -123,22 +123,31 @@ function httpRedirectCookieTest(cookie, expectedValue, name, location) {
     name);
 }
 
+// Cleans up all cookies accessible via document.cookie. This will not clean up
+// any HttpOnly cookies.
+function dropAllDomCookies() {
+  let cookies = document.cookie.split('; ');
+  for (const cookie of cookies) {
+    if (!Boolean(cookie))
+      continue;
+    document.cookie = `${cookie}; expires=01 Jan 1970 00:00:00 GMT`;
+  }
+  assert_equals(document.cookie, '', 'All DOM cookies were dropped.');
+}
+
 // Sets a `cookie` via the DOM, checks it against `expectedValue` via the DOM,
 // then cleans it up via the DOM. This is needed in cases where going through
 // HTTP headers may modify the cookie line (e.g. by stripping control
 // characters).
 function domCookieTest(cookie, expectedValue, name) {
-  return test(() => {
+  return test(function() {
     document.cookie = cookie;
     let cookies = document.cookie;
-    if (Boolean(expectedValue)) {
-      assert_equals(cookies, expectedValue, 'The cookie was set as expected.');
-    } else {
-      assert_equals(cookies, expectedValue, 'The cookie was rejected.');
-    }
-    document.cookie = `${expectedValue}; expires=01 Jan 1970 00:00:00 GMT`;
+    this.add_cleanup(dropAllDomCookies);
     assert_equals(
-        document.cookie, '', 'The cookies were cleaned up properly post-test.');
+        cookies, expectedValue,
+        Boolean(expectedValue) ? 'The cookie was set as expected.' :
+                                 'The cookie was rejected.');
   }, name);
 }
 
diff --git a/tests/wpt/web-platform-tests/cookies/value/value-ctl.html b/tests/wpt/web-platform-tests/cookies/value/value-ctl.html
index e76a95f3f1d..71c10c21415 100644
--- a/tests/wpt/web-platform-tests/cookies/value/value-ctl.html
+++ b/tests/wpt/web-platform-tests/cookies/value/value-ctl.html
@@ -16,6 +16,9 @@
       // CTLs are defined by RFC 5234 to be %x00-1F / %x7F.
       const {TERMINATING_CTLS, CTLS} = getCtlCharacters();
 
+      // Start with a clean slate.
+      dropAllDomCookies();
+
       // Test that terminating CTLs truncate the cookie string.
       for (const ctl of TERMINATING_CTLS) {
         domCookieTest(
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/break3/moz-block-fragmentation-001-print-ref.html b/tests/wpt/web-platform-tests/css/css-break/overflowing-block-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/break3/moz-block-fragmentation-001-print-ref.html
rename to tests/wpt/web-platform-tests/css/css-break/overflowing-block-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/break3/moz-block-fragmentation-001-print.html b/tests/wpt/web-platform-tests/css/css-break/overflowing-block-print.html
similarity index 81%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/break3/moz-block-fragmentation-001-print.html
rename to tests/wpt/web-platform-tests/css/css-break/overflowing-block-print.html
index 61b72e2ab96..daa9e24f33a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/break3/moz-block-fragmentation-001-print.html
+++ b/tests/wpt/web-platform-tests/css/css-break/overflowing-block-print.html
@@ -4,8 +4,8 @@
   Overflowing content does not affect whether a fixed-height box fits on a page,
   but does get printed on the next page.
 </title>
-<meta name="flags" content="may print">
-<link rel="match" href="moz-block-fragmentation-001-print-ref.html">
+<meta name="flags" content="may">
+<link rel="match" href="overflowing-block-print-ref.html">
 <link rel="help" href="https://www.w3.org/TR/css-break-3/#parallel-flows">
 <style>
   * {
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animate-invalid.html b/tests/wpt/web-platform-tests/css/css-properties-values-api/animate-invalid.html
new file mode 100644
index 00000000000..41cbd067b52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/animate-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>Do not crash when animating to unresolved var()</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api/#dom-css-registerproperty">
+<link rel="help" href="https://crbug.com/1185524">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="target"></div>
+<script>
+  promise_test(async function(){
+    CSS.registerProperty({
+      name: '--x',
+      syntax: '<number>',
+      initialValue: '1',
+      inherits: false
+    });
+    let animation = target.animate({'--x': [ 'var(--unknown)']}, 100);
+    await animation.ready;
+    assert_equals(getComputedStyle(target).getPropertyValue('--x'), '1');
+  }, 'Do not crash when animating to unresolved var()');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/negative_caption_margin.html b/tests/wpt/web-platform-tests/css/css-tables/crashtests/negative_caption_margin.html
new file mode 100644
index 00000000000..cd3c4f4bf7a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/crashtests/negative_caption_margin.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+
+<style>
+*{
+  overflow:scroll;
+  margin:-900%  3000000px;
+}
+</style>
+
+<table style="overflow:scroll;margin:-900%  3000000px;">
+<caption style="overflow:scroll;margin:-900%  3000000px;">
+
diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed.html b/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed.html
index ed126710601..4f7cf8ecb37 100644
--- a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed.html
+++ b/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed.html
@@ -24,7 +24,7 @@
   }
 </style>
 <main>
-<h1>Fixed tables: Compute column computed widths from assignable table width</h1>
+ <h1>Fixed tables: Compute column computed widths from assignable table width</h1>
 <ul>
   <li>auto columns have a min width of 0. Max width still gets computed.</li>
   <li>percent columns have a min width of 0.</li>
@@ -298,7 +298,7 @@ Columns are scaled so they add up to 100%
 <h2>Percentage/auto/fixed mix</h2>
 
 <p class="testdesc">Assignable: 100px;C0:50% C1:100px C2: Auto
-C0: 50% becomes
+C0, C1 get assigned values, C2 fills the rest.
 <table style="width:calc(100px + 32px)" data-expected-width=132>
   <tr>
     <td style="width:50%" data-expected-width=50>50%</td>
@@ -326,6 +326,48 @@ Fixed widths get distributed first, percentage takes the rest.
     <td style="width:60px" data-expected-width=60>60px</td>
   </tr>
 </table>
+
+<h2>Fixed 0-width columns</h2>
+<p>Fixed 0-width columns are an exception. They are treated as a mix of fixed and auto columns.</p>
+  <li>If there are only zero-width columns, width is distibuted evenly.</li>
+  <li>If there are any fixed,percentage, or auto columns,  0-width columns do not grow.</li>
+<p class="testdesc">Assignable: 100px;C0:0-width, C1:0-width
+  All 0-width columns grow.
+</p>
+<table style="width:calc(100px + 24px)" data-expected-width=124>
+  <tr>
+    <td style="width:0" data-expected-width=50>0</td>
+    <td style="width:0" data-expected-width=50>0</td>
+  </tr>
+</table>
+<p class="testdesc">Assignable: 100px;C0:0-width, C1:auto
+  0-width column does not grow.
+</p>
+<table style="width:calc(100px + 24px)" data-expected-width=124>
+  <tr>
+    <td style="width:0" data-expected-width=0>0</td>
+    <td style="width:auto" data-expected-width=100>0</td>
+  </tr>
+</table>
+<p class="testdesc">Assignable: 100px;C0:0-width, C1:50px
+  0-width column does not grow.
+</p>
+<table style="width:calc(100px + 24px)" data-expected-width=124>
+  <tr>
+    <td style="width:0" data-expected-width=0>0</td>
+    <td style="width:50px" data-expected-width=100>0</td>
+  </tr>
+</table>
+<p class="testdesc">Assignable: 100px;C0:0-width, C1:50%
+  0-width column does not grow.
+</p>
+<table style="width:calc(100px + 24px)" data-expected-width=124>
+  <tr>
+    <td style="width:0" data-expected-width=0>0</td>
+    <td style="width:50%" data-expected-width=100>0</td>
+  </tr>
+</table>
+
 </main>
 <script>
   checkLayout("table");
diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/colspan_redistribution.tentative.html b/tests/wpt/web-platform-tests/css/css-tables/width-distribution/colspan_redistribution.tentative.html
deleted file mode 100644
index d5f7451456a..00000000000
--- a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/colspan_redistribution.tentative.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!doctype html>
-<script src='/resources/testharness.js'></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="/resources/check-layout-th.js"></script>
-<link rel="author" title="Aleks Totic" href="atotic@chromium.org" />
-<link rel="help" href="https://www.w3.org/TR/css-tables-3/#distributing-width-to-columns" />
-<style>
-  table {
-    background: gray;
-    margin-bottom: 24px;
-    border-spacing: 8px 8px;
-  }
-  td {
-    padding: 0;
-    background: #BFB;
-    font-size: 10px;
-  }
-  td > div {
-    display: inline-block;
-    background: rgba(56,162,56,0.3);
-  }
-  .error {
-    color: red;
-  }
-  .brick {
-    width: 30px;
-    height: 20px;
-  }
-  p {
-    margin-top:4px;
-    margin-bottom:4px;
-  }
-  .rule1 {
-    background: #87dc8a;
-  }
-  .rule2 {
-    background: #3ae4cc;
-  }
-  .rule1and2 {
-    background: #fda4a4;
-  }
-</style>
-<h1>Colspan > 1 width redistribution</h1>
-<p>This page is intended to be used as a wpt testharness test, and for examining what algorithms do. Hovering over cells will display information about the table.</p>
-<p>Principles</p>
-<ul>
-  <li>Distribution should be stable: reordered span cells retain their width.</li>
-</ul>
-<p>Wide cell redistributes its different widths to the spanned cells: percentage, min and max.</p>
-<p>Creating understandable tests with percentage cells is complex because the relationship between percentage cell width, and table width is complex. Rules that govern relationship between table grid width and percentage cell width are:</p>
-<ol>
-  <li><span class="rule1">Rule#1</span>, Single column sets minimum table width. Minimum table width is column.min_width / column.percent * 100.</li>
-  <li><span class="rule2">Rule#2</span>, All percentage columns set minimum table width. <br>Let P% be sum of all percentages, and Mpx sum of minimum widths of all non-percentage columns. The equations below determine minimum table width:
-    <ul>
-    <li>table width = Mpx + Ppx </li>
-    <li>P% + M% = 100%</li>
-    <li>Ppx * P% = Mpx * M% </li>
-    <li>Ppx * P% = Mpx * (100-P%) </li>
-    <li>Ppx = Mpx * (100-P%) / P% </li>
-    <li>table width = Mpx + Mpx * (100-P%) / P%.</li>
-    <li>table width = Mpx * (1 + (100-P%)/P%)</li>
-    </ul>
-  </li>
-  <p class="error">FF and Edge interpret rule#2 as maximum table width, while Chrome interprets it as minimum table width. </p>
-  <p>Table backgrounds will change if they match the 2 rules above: <span class="rule1">Rule#1</span>, <span class="rule2">Rule#2</span>, and both <span class="rule1and2">Rule#1 and Rule#2</span>.</p>
-</ol>
-  <p>All examples have border-spacing:8, td.padding:0.</p>
-
-<h2>Percentage redistribution</h2>
-
-<h3>Percentage CSS constrained span cells</h3>
-
-<p>Rules<br>
-  <ul>
-    <li>min width never gets smaller than it started.
-    <li>min width becomes cell.percent/cells.percent * wide_cell.min_width</li>
-    <li>max width becomes cell.percent/cells.percent * wide_cell.max_width</li>
-  </ul>
-</p>
-
-<p>10) auto/300px wide cell, 25%/50px span min width<br>
-wide min width gets distributed evenly (-border_spacing) to both cells at 146px<br>
-Table width: 146/0.25 + 4*8 = 584 + 32 = 616
-<table data-expected-width="616">
-  <tr>
-    <td style="width:25%" data-expected-width="146"><div style="width:50px">25%/30px</div></td>
-    <td style="width:25%"><div style="width:50px">25%/30px</div></td>
-    <td style="width:20px">x</td>
-  </tr>
-  <tr>
-    <td colspan=2 style=""><div style="width:300px">300px min</div></td>
-  </tr>
-</table>
-
-<p>11) auto/400px wide cell, 20%/50px, 60%/50px spans.<br>
-400 - 8px min width gets redistributed to span cells as 98px/294px.<br>
-98px/0.2 => min grid width 490 + 4*8 = 522.</p>
-<p class="error">Edge disagrees, table is 870</p>
-<div style="width:600px">
-<table data-expected-width="522">
-  <tr>
-    <td style="width:20%" data-expected-width="98"><div style="width:50px">20%/50px</div></td>
-    <td style="width:60%" data-expected-width="294"><div style="width:50px">60%/50px</div></td>
-    <td style="width:20px">x</td>
-  </tr>
-  <tr>
-    <td colspan=2 style=""><div style="width:400px">400px min</div></td>
-  </tr>
-</table>
-</div>
-
-<p>12) auto/400px wide cell, 50%/150px, 30%/150px spans.<br>
-This tests conflict resolution where min-width > redistributed width, and all browsers disagree.<br>
-min-width of the 2nd cell is larger than redistributed width, causing differences.<br>
-400-8px distributed max width tries to redistribute as 245|147, but gets constrained to 245|150 in Chrome.<br>
-table width from cell 1 245/0.5 + 4*8 = 522<br>
-table width from cell 2 150/0.3 + 4*8 = 532<br>
-cell 1 = 50% of 500 = 250, cell 2 = 30% of 500 = 150 , cell 3 gets the remaining 100</p>
-<p class="error">Chrome/FF/Edge end up with tables of different widths: 532/590/685. Chrome's 2nd span cell seems 'most correct' at its original max width of 150. In FF, extra min-width seems to cause more width to be redistributed. If you hover over 30%/150 cell, its min width will change to 100px, and all browsers will agree.</p>
-<style>
-  .test12:hover {
-    width:100px !important;
-  }
-</style>
-<table data-expected-width="532">
-  <tr>
-    <td style="width:50%" data-expected-width="250"><div style="width:150px">50%/150px</div></td>
-    <td style="width:30%" data-expected-width="150"><div class="test12" style="width:150px">30%/150px</div></td>
-    <td style="width:20px" data-expected-width="100">x</td>
-  </tr>
-  <tr>
-    <td colspan=2 style=""><div style="width:400px">400px min</div></td>
-  </tr>
-</table>
-
-<p>13) auto/400px wide cell, 50%/75px/125px, 30%/75px/125px spans.<br>
-400-8px min width gets redistributed as 245/147 (no min width limits)<br>
-</p>
-<p class="error">Edge is different</p>
-  <table data-expected-width="522">
-  <tr>
-    <td style="width:50%" data-expected-width="245"><div style="width:75px">50%/75</div><div style="width:50px">/125</div></td>
-    <td style="width:30%" data-expected-width="147"><div style="width:75px">30%/75</div><div style="width:50px">/125</div></td>
-    <td style="width:20px">x</td>
-  </tr>
-  <tr>
-    <td colspan=2 style=""><div style="width:400px">300px min</div></td>
-  </tr>
-</table>
-
-
-<script>
-function measureCellMinMax(cell) {
-  let d = document.createElement("div");
-  let clone = cell.cloneNode(true);
-  for (child of Array.from(clone.childNodes))
-    d.appendChild(child);
-  d.style.width = "min-content";
-  document.body.appendChild(d);
-  let min = d.offsetWidth;
-  d.style.width = "max-content";
-  let max = d.offsetWidth;
-  d.remove();
-  return {min: min, max: max};
-}
-function annotateTable(t) {
-  let tableWidth = t.offsetWidth;
-
-  let firstCell;
-  let totalCellPercent = 0;
-  let nonPercentCellWidth = 0;
-  let tableMinWidthByCellPercent = 0;
-  let cellCount = 0;
-  let cells = Array.from(t.querySelectorAll("td"));
-  let spacing = (2 + cells.length - 1)*8;
-  for (let cell of cells) {
-    if (!firstCell)
-      firstCell = cell;
-    cellCount++;
-    let percent = cell.offsetWidth / (tableWidth - spacing) * 100;
-    let minmax = measureCellMinMax(cell);
-    let title = `${cell.offsetWidth.toFixed(1)}px\nmin:${minmax.min}px max:${minmax.max}px ${percent.toFixed(1)}%`;
-    let cssWidth = cell.style.width;
-    if (cssWidth) {
-      let w = parseFloat(cssWidth);
-      if (cssWidth.match(/\%/)) {
-        totalCellPercent += w;
-        let tableMinWidth = minmax.min / (w / 100);
-        tableMinWidthByCellPercent = Math.max(tableMinWidthByCellPercent, tableMinWidth);
-        title += `\nmin table: ${tableMinWidth.toFixed(0)}px`;
-      } else {
-        nonPercentCellWidth += w;
-      }
-    }
-    title += `\nTable: ${tableWidth.toFixed(0)} spacing: ${spacing}px`;
-    cell.setAttribute("title", title);
-  }
-
-
-  // Display table statistics in first cell.
-  if (firstCell) {
-    let title = firstCell.getAttribute("title");
-    let ruleMatch = 0;
-    if (tableMinWidthByCellPercent != 0) {
-      if ((tableMinWidthByCellPercent + spacing) == tableWidth)
-        ruleMatch += 1;
-      title += `\nTable min by single cell percent: ${tableMinWidthByCellPercent.toFixed(1)}`;
-    } else {
-      title += "\nTable min by single cell percent NA";
-    }
-    if (nonPercentCellWidth && totalCellPercent > 0) {
-      totalCellPercent = Math.min(totalCellPercent, 100);
-      title += `\nPercent sum: ${totalCellPercent.toFixed(1)}%, non percent width: ${nonPercentCellWidth}px`;
-      let tableMinBySum = (totalCellPercent / (100 - totalCellPercent) +1) * nonPercentCellWidth;
-      if (Math.floor((tableMinBySum + spacing)) == Math.floor(tableWidth))
-        ruleMatch += 2;
-      title += `\nTable min by sum ${totalCellPercent}%: ${tableMinBySum.toFixed(1)}px`;
-    } else {
-      "Table min by % sum not available";
-    }
-    firstCell.setAttribute("title", title);
-    switch(ruleMatch) {
-      case 1: t.classList.toggle('rule1'); break;
-      case 2: t.classList.toggle('rule2'); break;
-      case 3: t.classList.toggle('rule1and2'); break;
-      default: break;
-    }
-  }
-}
-for (let t of Array.from(document.querySelectorAll("table")))
-  annotateTable(t);
-checkLayout("table");
-</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-inline-image.html b/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-inline-image.html
new file mode 100644
index 00000000000..1bdc75a27a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-inline-image.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<title>scrollIntoView uses the element's bounding rect rather than line box</title>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#scroll-an-element-into-view">
+<style>
+img {
+  height: 100vh;
+  width: 100px;
+}
+body {
+  margin-bottom: 100vh;
+}
+</style>
+<body>
+<a id="scrollto">To be scrolled into view</a><img src="/images/blue.png">
+</body>
+<script>
+
+test(t => {
+  window.scrollTo(0, 0);
+  const target = document.getElementById("scrollto");
+  target.scrollIntoView();
+  assert_approx_equals(window.scrollY, target.offsetTop, 1);
+}, "Scrolling an inline element with a large line height uses the bounding rect");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html
index c203c06f6ea..f607df250a5 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html
@@ -45,15 +45,16 @@
     <span id="el" contenteditable>Focus me</span>
   </div>
   <script>
-    setup({ explicit_done: true });
-
+    var actions_promise;
     async_test(function(t) {
       el.addEventListener("focus", t.step_func_done(function() {
         assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 128, 0)", `outlineColor for ${el.tagName}#${el.id} should be green`);
         assert_not_equals(getComputedStyle(el).backgroundColor, "rgb(255, 0, 0)", `backgroundColor for ${el.tagName}#${el.id} should NOT be red`);
+        // Make sure the test finishes after all the input actions are completed.
+        actions_promise.then( () => t.done() );
       }));
 
-      test_driver.click(el).then(done());
+      actions_promise = test_driver.click(el);
     }, "Focus should always match :focus-visible on content editable divs");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js b/tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js
index 070de34c72a..5a7726f4fdc 100644
--- a/tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js
+++ b/tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js
@@ -8,7 +8,7 @@
 // https://wicg.github.io/private-network-access/
 
 idl_test(
-  ['cors-rfc1918'],
+  ['private-network-access'],
   ['html', 'dom'],
   idlArray => {
     if (self.GLOBAL.isWorker()) {
diff --git a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
deleted file mode 100644
index e3117265450..00000000000
--- a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: Web App Manifest (https://w3c.github.io/manifest/)
-
-dictionary WebAppManifest {
-   TextDirectionType dir = "auto";
-   DOMString lang;
-   USVString name;
-   USVString short_name;
-   sequence<ManifestImageResource> icons;
-   USVString start_url;
-   DisplayModeType display = "browser";
-   OrientationLockType orientation;
-   USVString theme_color;
-   USVString background_color;
-   USVString scope;
-   sequence<ExternalApplicationResource> related_applications;
-   boolean prefer_related_applications = "false";
-   sequence<ShortcutItem> shortcuts;
-};
-
-enum TextDirectionType { "ltr", "rtl", "auto" };
-
-enum DisplayModeType {
-  "fullscreen",
-  "standalone",
-  "minimal-ui",
-  "browser"
-};
-
-dictionary ManifestImageResource : ImageResource {
-  USVString purpose;
-};
-
-dictionary ShortcutItem {
-  required USVString name;
-  USVString short_name;
-  USVString description;
-  required USVString url;
-  sequence<ManifestImageResource> icons;
-};
-
-dictionary ExternalApplicationResource {
-  required USVString platform;
-  USVString url;
-  DOMString id;
-  USVString min_version;
-  sequence<Fingerprint> fingerprints;
-};
-
-dictionary Fingerprint {
-  USVString type;
-  USVString value;
-};
diff --git a/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl b/tests/wpt/web-platform-tests/interfaces/private-network-access.idl
similarity index 100%
rename from tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
rename to tests/wpt/web-platform-tests/interfaces/private-network-access.idl
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 5d8db43125e..0b95e5a9f50 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -740,6 +740,7 @@ MISSING DEPENDENCY: resources/chromium/webxr-test.js
 
 # Tests that are false positives for using Ahem as a system font
 AHEM SYSTEM FONT: acid/acid3/test.html
+AHEM SYSTEM FONT: resource-timing/entry-attributes.html
 AHEM SYSTEM FONT: resource-timing/font-timestamps.html
 AHEM SYSTEM FONT: resource-timing/resources/all_resource_types.htm
 AHEM SYSTEM FONT: resource-timing/resources/iframe-reload-TAO.sub.html
diff --git a/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html b/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html
index 1aee1a3958b..013f4d7989c 100644
--- a/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html
+++ b/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html
@@ -8,7 +8,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 
-// Returns a promise that settles once the given path has been fetched.
+// Returns a promise that settles once the given path has been fetched as an
+// image resource.
 function load_image(path) {
   return new Promise(resolve => {
     const img = new Image();
@@ -17,6 +18,21 @@ function load_image(path) {
   });
 }
 
+// Returns a promise that settles once the given path has been fetched as a
+// font resource.
+function load_font(path) {
+  document.getElementById('forFonts').innerHTML = `
+    <style>
+    @font-face {
+        font-family: ahem;
+        src: url('${path}');
+    }
+    </style>
+    <div style="font-family: ahem;">This fetches ahem font.</div>
+  `;
+  return document.fonts.ready;
+}
+
 function assert_ordered(entry, attributes) {
   let before = attributes[0];
   attributes.slice(1).forEach(after => {
@@ -46,18 +62,7 @@ function assert_positive(entry, attributes) {
   });
 }
 
-promise_test(async () => {
-  // Clean up entries from scripts includes.
-  performance.clearResourceTimings();
-  await load_image("resources/fake_responses.py#hash=1");
-  const entry_list = performance.getEntriesByType("resource");
-  if (entry_list.length != 1) {
-    throw new Error("There should be one entry for one resource");
-  }
-  const entry = entry_list[0];
-  assert_true(entry.name.includes('#hash=1'),
-    "There should be a hash in the resource name");
-
+function assert_http_resource(entry) {
   assert_ordered(entry, [
     "fetchStart",
     "domainLookupStart",
@@ -86,7 +91,33 @@ promise_test(async () => {
     "encodedBodySize",
     "decodedBodySize",
   ]);
-}, "URL fragments should be present in the 'name' attribute");
+}
+
+promise_test(async () => {
+  // Clear out everything that isn't the one ResourceTiming entry under test.
+  performance.clearResourceTimings();
+  await load_image("resources/fake_responses.py#hash=1");
+  const entry_list = performance.getEntriesByType("resource");
+  if (entry_list.length != 1) {
+    throw new Error("There should be one entry for one resource");
+  }
+  const entry = entry_list[0];
+  assert_true(entry.name.includes('#hash=1'),
+    "There should be a hash in the resource name");
+
+  assert_http_resource(entry);
+}, "Image resources should generate conformant entries");
+
+promise_test(async () => {
+  // Clear out everything that isn't the one ResourceTiming entry under test.
+  performance.clearResourceTimings();
+  await load_font("/fonts/Ahem.ttf");
+  const entry_list = performance.getEntriesByType("resource");
+  if (entry_list.length != 1) {
+    throw new Error("There should be one entry for one resource");
+  }
+  assert_http_resource(entry_list[0]);
+}, "Font resources should generate conformant entries");
 
 </script>
 </head>
@@ -94,5 +125,6 @@ promise_test(async () => {
 <h1>Description</h1>
 <p>This test validates that PerformanceResourceTiming entries' attributes are
 populated with the correct values.</p>
+<div id="forFonts"></div>
 </body>
 </html>